[commit] r2396 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Nov  5 14:09:12 2013
New Revision: 2396

Log:
Fix 2370: Better ErrorInfo

Modified:
   trunk/GME/Mga/MgaTrukk.h

Modified: trunk/GME/Mga/MgaTrukk.h
==============================================================================
--- trunk/GME/Mga/MgaTrukk.h	Tue Nov  5 14:08:52 2013	(r2395)
+++ trunk/GME/Mga/MgaTrukk.h	Tue Nov  5 14:09:12 2013	(r2396)
@@ -378,19 +378,22 @@
 	return S_OK;
 
 #define COMRETURN_IN_TRANSACTION_MAYBE(hr) \
-	if (FAILED(hr)) { \
+  do { \
+	HRESULT _hr = hr; \
+	if (FAILED(_hr)) { \
 		if (!(this->mgaproject->preferences & MGAPREF_NO_NESTED_TX)) \
 		{ \
 			HRESULT hrTx = ttt.Abort(); \
 			if (FAILED(hrTx)) return hrTx; \
 		} \
-		return hr; \
+		return _hr; \
 	} else { \
 		if (!(this->mgaproject->preferences & MGAPREF_NO_NESTED_TX)) \
 			return ttt.Commit(); \
 		else \
 			return S_OK; \
-	}
+	} \
+  } while(0);