[commit] r1446 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Jul 27 10:40:51 2011
New Revision: 1446

Log:
Fix crash when not in transaction. Fewer exceptions.

Modified:
   trunk/GME/Mga/MgaProject.cpp

Modified: trunk/GME/Mga/MgaProject.cpp
==============================================================================
--- trunk/GME/Mga/MgaProject.cpp	Tue Jul 26 15:12:04 2011	(r1445)
+++ trunk/GME/Mga/MgaProject.cpp	Wed Jul 27 10:40:51 2011	(r1446)
@@ -697,7 +697,7 @@
 
 		CREATEEXCOLLECTION_FOR(MgaFCO, q);
 		CComPtr<IMgaFolder> rootf;
-		get_RootFolder(&rootf);
+		COMTHROW(get_RootFolder(&rootf));
 		recursefolders(CoreObj(rootf), reinterpret_cast<CMgaFilter *>(filter),  q);
 		*fcos = q.Detach();
     }
@@ -1310,7 +1310,9 @@
 		checkofftemporary = false;
 		in_nested = false;
 		must_abort = false;
-		COMTHROW(dataproject->PushTerritory(t->coreterr));
+		HRESULT hr = dataproject->PushTerritory(t->coreterr);
+		if (FAILED(hr))
+			COMRETURN(hr);
 		baseterr = activeterr = t;
 		notifyqueueprocessed = false;
 		MARKSIG('3');