[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1381
Date       : Wed Jun 28 14:16:59 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camelot.cpp

Fix splash screen apparent race condition on the Mac


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1380)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1381)
@@ -257,7 +257,11 @@
 {
 	static /*TYPENOTE: Correct*/ long	lLastTimeStamp = 0;
 
-	if (( event.GetEventType() == wxEVT_CREATE ) && (event.GetEventObject()->IsKindOf(CLASSINFO(wxTopLevelWindow))))
+	if (( event.GetEventType() == wxEVT_CREATE )
+		&& (event.GetEventObject()->IsKindOf(CLASSINFO(wxTopLevelWindow)))
+		&& !(event.GetEventObject()->IsKindOf(CLASSINFO(wxAdvSplashScreen))) // Don't trigger this on the creation of the splash screen itself
+		&& !(event.GetEventObject()->IsKindOf(CLASSINFO(wxSplashScreen)))
+		)
 	{
 		// a top level window is about to be created. End the splash screen if it is up as it may obscure it
 		CamResource::DoneInit(FALSE);	


Xara