[commit] r2693 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Aug 24 15:37:45 2017
New Revision: 2693

Log:
Reject DetachFromArchetype for non-primary derived

Modified:
   trunk/GME/Mga/MgaDeriveOps.cpp

Modified: trunk/GME/Mga/MgaDeriveOps.cpp
==============================================================================
--- trunk/GME/Mga/MgaDeriveOps.cpp	Thu Aug 24 15:37:41 2017	(r2692)
+++ trunk/GME/Mga/MgaDeriveOps.cpp	Thu Aug 24 15:37:45 2017	(r2693)
@@ -317,6 +317,11 @@
 {
 	COMTRY_IN_TRANSACTION {
 		CheckWrite();
+		VARIANT_BOOL prim_deriv;
+		COMTHROW(this->get_IsPrimaryDerived(&prim_deriv));
+		if (prim_deriv == VARIANT_FALSE) {
+			COMTHROW(E_MGA_INVALID_ARG);
+		}
 		CoreObj d = self[ATTRID_DERIVED], d2;
 		if(d) { // if self is really derived from something (d)
 			while((d2 = d[ATTRID_DERIVED]) != NULL)