[commit] r1382 - trunk/GME/Common

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Jun 23 17:35:52 2011
New Revision: 1382

Log:
Catch _com_error in COMCATCH

Modified:
   trunk/GME/Common/CommonError.h

Modified: trunk/GME/Common/CommonError.h
==============================================================================
--- trunk/GME/Common/CommonError.h	Thu Jun 23 15:45:41 2011	(r1381)
+++ trunk/GME/Common/CommonError.h	Thu Jun 23 17:35:52 2011	(r1382)
@@ -67,6 +67,15 @@
 		SetErrorInfo(e.hr); \
 		return e.hr; \
 	} \
+	catch(_com_error &e) \
+	{ \
+		{ CLEANUP; } \
+		if (e.Description() != _bstr_t()) \
+			SetErrorInfo(e.Description()); \
+		else \
+			SetStandardOrGMEErrorInfo(e.Error()); \
+		return e.Error(); \
+	} \
 	return S_OK;
 
 #define COMRETURN(HR) \