[commit] r1810 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan 20 16:18:36 2012
New Revision: 1810

Log:
Fix crash on decorator failed HRESULT

Modified:
   trunk/GME/Gme/GMEView.cpp

Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp	Fri Jan 20 16:18:24 2012	(r1809)
+++ trunk/GME/Gme/GMEView.cpp	Fri Jan 20 16:18:36 2012	(r1810)
@@ -4466,7 +4466,9 @@
 							   retVal != E_DECORATOR_NOT_IMPLEMENTED)
 					{
 						CancelDecoratorOperation();
-						COMTHROW(retVal);
+						// FIXME: how to handle this error?
+						// COMTHROW(retVal);
+						return;
 					}
 					if (IsInElementDecoratorOperation()) {
 						if (IsDecoratorOrAnnotator())
@@ -4645,7 +4647,9 @@
 								   retVal != E_DECORATOR_NOT_IMPLEMENTED)
 						{
 							CancelDecoratorOperation();
-							COMTHROW(retVal);
+							// FIXME: how to handle this error?
+							// COMTHROW(retVal);
+							return;
 						}
 					}
 				} else if (isInConnectionCustomizeOperation) {
@@ -4751,7 +4755,9 @@
 							retVal != E_DECORATOR_NOT_IMPLEMENTED)
 						{
 							CancelDecoratorOperation();
-							COMTHROW(retVal);
+							// FIXME: how to handle this error?
+							// COMTHROW(retVal);
+							return;
 						}
 						if (IsInElementDecoratorOperation()) {
 							if (IsDecoratorOrAnnotator())
@@ -4852,7 +4858,9 @@
 								   retVal != E_DECORATOR_NOT_IMPLEMENTED)
 						{
 							CancelDecoratorOperation();
-							COMTHROW(retVal);
+							// FIXME: how to handle this error?
+							// COMTHROW(retVal);
+							return;
 						}
 						CScrollZoomView::OnLButtonDown(nFlags, ppoint);
 						return;
@@ -4958,7 +4966,9 @@
 								   retVal != E_DECORATOR_NOT_IMPLEMENTED)
 						{
 							CancelDecoratorOperation();
-							COMTHROW(retVal);
+							// FIXME: how to handle this error?
+							// COMTHROW(retVal);
+							return;
 						}
 						if (IsInElementDecoratorOperation()) {
 							if (IsDecoratorOrAnnotator())
@@ -5409,7 +5419,9 @@
 						   retVal != E_DECORATOR_NOT_IMPLEMENTED)
 				{
 					CancelDecoratorOperation();
-					COMTHROW(retVal);
+					// FIXME: how to handle this error?
+					// COMTHROW(retVal);
+					return;
 				}
 				if (IsInElementDecoratorOperation()) {
 					if (IsDecoratorOrAnnotator())
@@ -6426,7 +6438,9 @@
 								retVal != E_DECORATOR_NOT_IMPLEMENTED)
 					{
 						CancelDecoratorOperation();
-						COMTHROW(retVal);
+						// FIXME: how to handle this error?
+						// COMTHROW(retVal);
+						return TRUE;
 					}
 				}
 			}
@@ -9163,7 +9177,9 @@
 						   retVal != E_DECORATOR_NOT_IMPLEMENTED)
 				{
 					CancelDecoratorOperation();
-					COMTHROW(retVal);
+					// FIXME: how to handle this error?
+					// COMTHROW(retVal);
+					return;
 				}
 			}
 		} else if (isInConnectionCustomizeOperation) {