[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1198
Date       : Fri May 26 19:49:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/optsunit.cpp

Fix crash on units dialog close - Bug #1120


Diff:
Index: Trunk/XaraLX/Kernel/optsunit.cpp
===================================================================
--- Trunk/XaraLX/Kernel/optsunit.cpp	(revision 1197)
+++ Trunk/XaraLX/Kernel/optsunit.cpp	(revision 1198)
@@ -1638,6 +1638,8 @@
 						if (pIsOk)
 							*pIsOk = TRUE;				// flag an ok return
 					}
+                    else
+                        Msg->DlgMsg = DIM_NONE;
 				}
 			break;
 
@@ -1715,12 +1717,15 @@
 		// Must do this before the Close and End
 		Result = DialogOp::Message(Message);
 
+// Commented out as base class closes the dialog in LX.
+#if 0
 		// End dialog here
 		if (EndDialog) 
 		{
 			Close();				// Hide the dialog box
 			End();					// Finish the operation
 		}
+#endif
 
 		// The message was for our dialog box so return that we have handled it, if necessary
 		return Result;


Xara