[commit] r1117 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan  7 19:18:07 2011
New Revision: 1117

Log:
TerminateProcess after EmergencySave, since closing windows doesnt do anything helpful

Modified:
   trunk/GME/Gme/GMEApp.cpp

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Fri Jan  7 19:17:43 2011	(r1116)
+++ trunk/GME/Gme/GMEApp.cpp	Fri Jan  7 19:18:07 2011	(r1117)
@@ -542,18 +542,8 @@
 		__except(crExceptionFilter(GetExceptionCode(), GetExceptionInformation())) {
 			EmergencySave();
 
-			// Modified by Peter:let's exit after emergency event
-			abort_on_close = true;
-			BeginWaitCursor();
-			if(CGMEDoc::theInstance) {
-				CGMEDoc::theInstance->OnCloseDocument(true);
-			}
-			EndWaitCursor();
-
-			retVal = -1;
-			// KMS: As our state may be corrupted, TerminateProcess so we don't run any atexits
+			// KMS: As our state may be corrupted, TerminateProcess so we don't run any atexits and crash again
 			TerminateProcess(GetCurrentProcess(), GetExceptionCode());
-			// End by Peter
 		}
 	}
 	// Closing GDI+
@@ -835,9 +825,9 @@
 			{
 				int buttonIndex = componentBar.ButtonToIndex(pCurrent);
 				componentBar.RemoveButton(buttonIndex);
-				componentBar.AdjustLayout();	// CMFCToolBar::AdjustLayout
-				componentBar.AdjustSizeImmediate(TRUE);
-				componentBar.RecalcLayout();	// CPane::RecalcLayout
+				//componentBar.AdjustLayout();	// CMFCToolBar::AdjustLayout
+				//componentBar.AdjustSizeImmediate(TRUE);
+				//componentBar.RecalcLayout();	// CPane::RecalcLayout
 			}
 		}
 
@@ -956,6 +946,8 @@
 			CMFCToolBarButton toolBarButton(commandID, nIndex, componentName + '\n' + toolTip, TRUE);
 
 			componentBar.InsertButton(toolBarButton);
+		}
+		if (plugins.GetSize() + interpreters.GetSize() != 0) {
 			componentBar.AdjustLayout();	// CMFCToolBar::AdjustLayout
 			componentBar.AdjustSizeImmediate(TRUE);
 			componentBar.RecalcLayout();	// CPane::RecalcLayout