[commit] r2113 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Nov 19 09:53:03 2012
New Revision: 2113

Log:
Dont try to MergeRegs on connection roles. Fixes DetachFromArchetype

Modified:
   trunk/GME/Mga/MgaComplexOps.cpp

Modified: trunk/GME/Mga/MgaComplexOps.cpp
==============================================================================
--- trunk/GME/Mga/MgaComplexOps.cpp	Mon Nov 19 09:52:40 2012	(r2112)
+++ trunk/GME/Mga/MgaComplexOps.cpp	Mon Nov 19 09:53:03 2012	(r2113)
@@ -1648,7 +1648,12 @@
 							ObjForCore( nmas)->GetGuidDisp( &bstr);
 							if( bstr) ObjForCore( nobj)->put_RegistryValue( CComBSTR( DETACHED_FROM), bstr);
 						}
-						MergeRegs(orig, nobj);
+						CComPtr<ICoreAttribute> regattr;
+						HRESULT hr = orig->get_Attribute(ATTRID_REGNODE, &regattr);
+						if (SUCCEEDED(hr))
+							MergeRegs(orig, nobj);
+						else if (hr != E_INVALIDARG)
+							COMTHROW(hr);
 						nobj[ai] = CComVariant( (IDispatch*) 0);//an empty value;
 						break;
 					}