[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1782
Date       : Sun Oct 21 17:16:22 BST 2007

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

Fix crash on Ubuntu Gutsy on startup where not having imagemagick caused
a dialog box to appear which crashed.


Diff:
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1781)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1782)
@@ -656,7 +656,9 @@
 	// Set the default
 	if ( ((UINT32)OK <EB_MAXBUTS) && butres[OK] && pButt[OK])
 	{
-		pButt[OK]->SetDefault();
+//		The following should be unnecessary but harmless. It appears to cause a crash on
+//		newer GTK under wxWidgets 2.6.xx for an "ImageMagick not installed" error box
+//		pButt[OK]->SetDefault();
 		pBox->SetDefaultItem(pButt[OK]);
 	}
 


Xara