[commit] r1820 - trunk/GME/MgaUtil

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed Feb 1 17:29:25 CST 2012


Author: ksmyth
Date: Wed Feb  1 17:29:25 2012
New Revision: 1820

Log:
Dont AbortTransaction if not in one

Modified:
   trunk/GME/MgaUtil/MgaLauncher.cpp

Modified: trunk/GME/MgaUtil/MgaLauncher.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaLauncher.cpp	Wed Feb  1 17:29:15 2012	(r1819)
+++ trunk/GME/MgaUtil/MgaLauncher.cpp	Wed Feb  1 17:29:25 2012	(r1820)
@@ -526,7 +526,8 @@
 					HRESULT hr = component->Initialize(project);
 					// Need to catch SEH exceptions (especially for Win7 x64: see GME-318)
 					if (SUCCEEDED(hr) && !InvokeExWithCrashRpt(compex, project, focusobj, selectedobjs, param, hr)) {
-						project->AbortTransaction();
+						if (project->ProjectStatus & 8)
+							project->AbortTransaction();
 						ThrowCOMError(E_POINTER, _T("An error has occurred in component ") + compname + _T(".\n")
 							_T("GME may not be in a stable state.\n")
 							_T("Please save your work and restart GME."));


More information about the gme-commit mailing list