[commit] r2070 - trunk/GME/Parser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Sep 27 13:11:42 2012
New Revision: 2070

Log:
Fix meta incompatiblity non-error (unrelated to recent changes)

Modified:
   trunk/GME/Parser/MgaParser.cpp

Modified: trunk/GME/Parser/MgaParser.cpp
==============================================================================
--- trunk/GME/Parser/MgaParser.cpp	Thu Sep 27 13:11:27 2012	(r2069)
+++ trunk/GME/Parser/MgaParser.cpp	Thu Sep 27 13:11:42 2012	(r2070)
@@ -1016,7 +1016,7 @@
 		COMTHROW(resolver->put_IsInteractive(previactmode));
 
 		bool cheat = false;
-		if(hr != S_OK && libn.size()) {
+		if(FAILED(hr) && libn.size()) {
 			CComPtr<IMgaMetaProject> mp;  // it is a library, maybe a rootfolder
 			COMTHROW(project->get_RootMeta(&mp));
 			COMTHROW(mp->get_RootFolder(PutOut(meta)));
@@ -1027,6 +1027,13 @@
 			}
 			COMTHROW(project->CheckSupress(VARIANT_TRUE));
 			cheat = true;
+		} else if (FAILED(hr)) {
+			_bstr_t error;
+			if (GetErrorInfo(error.GetAddress()))
+			{
+				throw_com_error(hr, error);
+			}
+			COMTHROW(hr);
 		}
 		ASSERT(meta);