[commit] r1116 - trunk/GME/GMEActiveBrowser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan  7 19:17:43 2011
New Revision: 1116

Log:
Fix crash when importing pasted xml fails

Modified:
   trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp

Modified: trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp	Thu Dec 30 09:28:17 2010	(r1115)
+++ trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp	Fri Jan  7 19:17:43 2011	(r1116)
@@ -829,9 +829,12 @@
 			return FALSE;
 		}
 			
-		bool res = CGMEDataSource::ParseXMLData(pDataObject, ccpTargetObject, doDragOp == DRAGOP_CLOSURE_MERGE);
-		
-		return res?TRUE:FALSE;
+		try {
+			bool res = CGMEDataSource::ParseXMLData(pDataObject, ccpTargetObject, doDragOp == DRAGOP_CLOSURE_MERGE);
+			return res?TRUE:FALSE;
+		} catch (hresult_exception& e) {
+			return FALSE;
+		}
 	}
 	// PETER: end