[commit] r2654 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Oct 10 11:14:36 2016
New Revision: 2654

Log:
Fix ErrorInfo for MgaProject::EnableAutoAddOns

Modified:
   trunk/GME/Mga/MgaProject.cpp

Modified: trunk/GME/Mga/MgaProject.cpp
==============================================================================
--- trunk/GME/Mga/MgaProject.cpp	Mon Oct  3 14:02:58 2016	(r2653)
+++ trunk/GME/Mga/MgaProject.cpp	Mon Oct 10 11:14:36 2016	(r2654)
@@ -1250,7 +1250,12 @@
 			if(autoaddons) StartAutoAddOns();
 			else StopAutoAddOns();
 		}
-	} COMCATCH(;)
+	} COMCATCH(
+		// We've already called SetErrorInfo, don't call it again
+		if (e.hr == E_MGA_COMPONENT_ERROR) {
+			return e.hr;
+		}
+	)
 }
 
 
@@ -1298,7 +1303,7 @@
 		if (errs) {
 			SetErrorInfo(_bstr_t(L"Could not create AddOn: ") + static_cast<const wchar_t*>(errs));
 			COMTHROW(E_MGA_COMPONENT_ERROR); // change error type
-		}		
+		}
 	}
 //	SetAutomatic();