Merge branch 'bugfix/iss10863' of https://github.com/montegoulding/livecode into bugfix-10863

runrevmark · runrevmark · commit cea6bb0305cd · 2013-05-07T13:20:46.000+01:00
diff --git a/engine/src/cmdsc.cpp b/engine/src/cmdsc.cpp
@@ -1687,6 +1687,12 @@ Exec_stat MCMakeGroup::exec(MCExecPoint &ep)
 				MCeerror->add(EE_GROUP_NOBG, line, pos);
 				return ES_ERROR;
 			}
+            
+            if (optr->getparent() != (MCControl *)chunkptr->getdestobj()->getparent())
+            {
+                MCeerror->add(EE_GROUP_DIFFERENTPARENT, line, pos);
+				return ES_ERROR;
+            }
 			
 			chunkptr->setdestobj(optr);
 			chunkptr = chunkptr->next;
@@ -1711,8 +1717,9 @@ Exec_stat MCMakeGroup::exec(MCExecPoint &ep)
 		gptr->makegroup(controls, tcard);
 	}
 	else
-		MCselected->group();
+		return MCselected->group(line,pos);
 	return ES_NORMAL;
+    
 }
 
 MCPasteCmd::~MCPasteCmd()
diff --git a/engine/src/executionerrors.h b/engine/src/executionerrors.h
@@ -2371,6 +2371,9 @@ enum Exec_errors
 	
 	// {EE-0778} image cache limit: not a number
 	EE_PROPERTY_BADIMAGECACHELIMIT,
+    
+    // {EE-0779} controls don't have the same owner
+	EE_GROUP_DIFFERENTPARENT,
 };
 
 extern const char *MCexecutionerrors;
diff --git a/engine/src/sellst.cpp b/engine/src/sellst.cpp
@@ -271,23 +271,28 @@ MCControl *MCSellist::clone(MCObject *target)
 	return t_result;
 }
 
-void MCSellist::group()
+Exec_stat MCSellist::group(uint2 line, uint2 pos)
 {
 	MCresult->clear(False);
 	if (objects != NULL && objects->ref->gettype() <= CT_FIELD
 	        && objects->ref->gettype() >= CT_GROUP)
 	{
 		MCObject *parent = objects->ref->getparent();
-		MCSelnode *tptr = objects->next();
-		while (tptr != objects)
-		{
+		MCSelnode *tptr = objects;
+		do {
+            if (tptr->ref->gettype() == CT_GROUP && static_cast<MCGroup *>(tptr->ref)->isshared())
+            {
+                MCeerror->add(EE_GROUP_NOBG, line, pos);
+				return ES_ERROR;
+            }
 			if (tptr->ref->getparent() != parent)
 			{
-				MCresult->sets("controls don't have the same owner");
-				return;
-			}
+                MCeerror->add(EE_GROUP_DIFFERENTPARENT, line, pos);
+				return ES_ERROR;
+            }
 			tptr = tptr->next();
-		}
+		} while (tptr != objects);
+        
 		sort();
 		MCControl *controls = NULL;
 		while (objects != NULL)
@@ -318,6 +323,7 @@ void MCSellist::group()
 		objects = new MCSelnode(gptr);
 		gptr->message(MCM_selected_object_changed);
 	}
+    return ES_NORMAL;
 }
 
 bool MCSellist::clipboard(bool p_is_cut)
diff --git a/engine/src/sellst.h b/engine/src/sellst.h
@@ -84,7 +84,7 @@ class MCSellist
 	void sort();
 	uint32_t count();
 	MCControl *clone(MCObject *target);
-	void group();
+	Exec_stat group(uint2 line, uint2 pos);
 	Boolean copy();
 	Boolean cut();
 	Boolean del();
