[commit] r1422 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jul 22 11:09:05 2011
New Revision: 1422

Log:
Dont need to make COM calls

Modified:
   trunk/GME/Mga/MgaTrukk.h

Modified: trunk/GME/Mga/MgaTrukk.h
==============================================================================
--- trunk/GME/Mga/MgaTrukk.h	Wed Jul 20 13:51:02 2011	(r1421)
+++ trunk/GME/Mga/MgaTrukk.h	Fri Jul 22 11:09:05 2011	(r1422)
@@ -301,12 +301,8 @@
 #define MGAPREF_NO_NESTED_TX 0x00000080
 
 #define COMTRY_IN_TRANSACTION_MAYBE \
-long prefmask; \
-HRESULT hr = this->mgaproject->get_Preferences(&prefmask); \
-if (FAILED(hr)) \
-	return hr; \
 Transaction ttt; \
-if (!(prefmask & MGAPREF_NO_NESTED_TX)) { \
+if (!(this->mgaproject->preferences & MGAPREF_NO_NESTED_TX)) { \
   HRESULT hr = ttt.Begin(mgaproject); \
   if (hr != S_OK) return hr; \
 } \
@@ -317,13 +313,14 @@
 { \
 	ASSERT( FAILED(e.hr) ); \
 	{ \
-		if(!(prefmask & MGAPREF_NO_NESTED_TX) && ((hr = ttt.Abort()) != S_OK)) return hr; \
+		HRESULT hr; \
+		if(!(this->mgaproject->preferences & MGAPREF_NO_NESTED_TX) && ((hr = ttt.Abort()) != S_OK)) return hr; \
 		CLEANUP; \
 	} \
 	MgaSetErrorInfo(e.hr); \
 	return e.hr; \
 } \
-if (!(prefmask & MGAPREF_NO_NESTED_TX)) \
+if (!(this->mgaproject->preferences & MGAPREF_NO_NESTED_TX)) \
 	return ttt.Commit(); \
 else \
 	return S_OK;