[commit] r1187 - trunk/GME/GMEActiveBrowser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Feb 17 10:45:12 2011
New Revision: 1187

Log:
Fix GME-337: infinite recursion when trying to abort transaction

Modified:
   trunk/GME/GMEActiveBrowser/GMEActiveBrowserCtl.cpp
   trunk/GME/GMEActiveBrowser/MgaContext.cpp

Modified: trunk/GME/GMEActiveBrowser/GMEActiveBrowserCtl.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/GMEActiveBrowserCtl.cpp	Wed Feb 16 17:05:35 2011	(r1186)
+++ trunk/GME/GMEActiveBrowser/GMEActiveBrowserCtl.cpp	Thu Feb 17 10:45:12 2011	(r1187)
@@ -179,13 +179,13 @@
 	CMgaContext* pMgaContext=&pApp->m_CurrentProject.m_MgaContext;
 
 	// Stopping transaction handling
-	pMgaContext->SetEventTransactionMode(TRUE);
+	pMgaContext->SetEventTransactionMode(true);
 
 	// Forwarding MGA messages to the control
-	pThis->OnMgaGlobalEvent( event);
+	pThis->OnMgaGlobalEvent(event);
 
 	// Starting transaction handling
-	pMgaContext->SetEventTransactionMode(FALSE);
+	pMgaContext->SetEventTransactionMode(false);
 	return S_OK;
 }
 

Modified: trunk/GME/GMEActiveBrowser/MgaContext.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/MgaContext.cpp	Wed Feb 16 17:05:35 2011	(r1186)
+++ trunk/GME/GMEActiveBrowser/MgaContext.cpp	Thu Feb 17 10:45:12 2011	(r1187)
@@ -88,6 +88,9 @@
 
 bool CMgaContext::AbortTransaction()
 {
+	if(m_bEventTransactionMode)
+		return true;
+
 	if(m_nPendingTransactions==0)
 		return false;