[commit] r1354 - trunk/GME/ObjectInspector

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Jun 14 16:16:21 2011
New Revision: 1354

Log:
E_MGA_CONSTRAINT_VIOLATION is not unexpected

Modified:
   trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp

Modified: trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp	Mon Jun 13 18:15:18 2011	(r1353)
+++ trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp	Tue Jun 14 16:16:21 2011	(r1354)
@@ -1099,11 +1099,11 @@
 			this->FireRootFolderNameChanged();
 		}
 	}
-	catch (hresult_exception e)
+	catch (hresult_exception& e)
 	{
-		ASSERT(0);
 		m_project->AbortTransaction();
-		CWnd::MessageBox(_T("Object Inspector could not write object name due to an unexpected MGA error. We apoligize for the inconvenience."),_T("Object inspector"),MB_ICONERROR);
+		if (e.hr != E_MGA_CONSTRAINT_VIOLATION)
+			CWnd::MessageBox(_T("Object Inspector could not write object name due to an unexpected MGA error. We apoligize for the inconvenience."),_T("Object inspector"),MB_ICONERROR);
 	}
 
 }