[commit] r1388 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Jun 27 16:27:43 2011
New Revision: 1388

Log:
Fewer exceptions

Modified:
   trunk/GME/Mga/MgaTerritory.cpp

Modified: trunk/GME/Mga/MgaTerritory.cpp
==============================================================================
--- trunk/GME/Mga/MgaTerritory.cpp	Mon Jun 27 16:25:32 2011	(r1387)
+++ trunk/GME/Mga/MgaTerritory.cpp	Mon Jun 27 16:27:43 2011	(r1388)
@@ -103,7 +103,11 @@
 */
 
 	COMTRY {
-	   if(coreterr) COMTHROW(coreterr->Clear());
+		if(coreterr) {
+			HRESULT hr = coreterr->Clear();
+			if (FAILED(hr))
+				COMRETURN(hr);
+		}
 	} COMCATCH(;);
 	
 };
@@ -116,7 +120,8 @@
 
 STDMETHODIMP CMgaTerritory::Destroy() {
 	COMTRY {
-		if(!coreterr) COMTHROW(E_MGA_TARGET_DESTROYED);
+		if (!coreterr) 
+			return E_MGA_TARGET_DESTROYED;
 		COMTHROW(Flush());
 		CMgaProject::tercoll::iterator i = mgaproject->allterrs.begin(), end = mgaproject->allterrs.end();
 		for(;i != end; ++i) {