[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1161
Date       : Mon May 22 17:54:06 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camresource.cpp
   M /Trunk/XaraLX/wxOil/errors.cpp

Make splash screen even more forgiving to errors


Diff:
Index: Trunk/XaraLX/wxOil/camresource.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camresource.cpp	(revision 1160)
+++ Trunk/XaraLX/wxOil/camresource.cpp	(revision 1161)
@@ -1806,8 +1806,10 @@
 #if !defined(EXCLUDE_FROM_XARLIB)
 	if (pSplashScreen)
 	{
-		delete pSplashScreen;
+        ::wxYield();
+		pSplashScreen->Destroy();
 		pSplashScreen = NULL;
+        ::wxYield();
 	}
 	if (pSplashBitmap)
 	{
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1160)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1161)
@@ -556,6 +556,9 @@
 		delete pBox;
 		return OK;
 	}
+
+	CamResource::DoneInit();
+
 	pMessage->Wrap(400);
     //pMessage->Enable(false); // this annoyingly does not grey it
 	//pMessage->SetBackgroundColour(pBox->GetBackgroundColour());
@@ -619,7 +622,6 @@
     pBox->GetSizer()->SetSizeHints(pBox);
     pBox->Centre();
 
-	CamResource::DoneInit();
  	// Disable the system's functionality for serious errors (i.e. stop rendering etc).
  	if (Error == ERRORTYPE_SERIOUS || Error == ERRORTYPE_ENSURE) CCamApp::DisableSystem();
 	if ( Error::IsInRenderThread() )


Xara