Merge pull request livecode#550 from runrevsebastien/bugfix-11950

livecodeali · livecodeali · commit 6e9bc337b0a2 · 2014-04-02T09:25:21.000+01:00
[[ Bug 11950 ]] mark card does not work
diff --git a/docs/notes/bugfix-11950.md b/docs/notes/bugfix-11950.md
@@ -0,0 +1 @@
+# mark card does not work
diff --git a/engine/src/cmds.cpp b/engine/src/cmds.cpp
@@ -1100,32 +1100,41 @@ void MCMarking::exec_ctxt(MCExecContext &ctxt)
         else
             MCInterfaceExecUnmarkCard(ctxt, t_object);
 	}
-    if (tofind == nil)
-        if (mark)
+    // SN-2014-03-21 [[ Bug 11950 ]]: 'mark' shouldn't throw an error when failing to mark when card is nil
+    // Any error set is discarded in the end of this block - unless is was triggered by a bad string.
+    else
+    {
+        if (tofind == nil)
         {
-            if (where != nil)
-                MCInterfaceExecMarkCardsConditional(ctxt, where);
+            if (mark)
+            {
+                if (where != nil)
+                    MCInterfaceExecMarkCardsConditional(ctxt, where);
+                else
+                    MCInterfaceExecMarkAllCards(ctxt);
+            }
             else
-                MCInterfaceExecMarkAllCards(ctxt);
+            {
+                if (where != nil)
+                    MCInterfaceExecUnmarkCardsConditional(ctxt, where);
+                else
+                    MCInterfaceExecUnmarkAllCards(ctxt);
+            }
         }
         else
         {
-            if (where != nil)
-                MCInterfaceExecUnmarkCardsConditional(ctxt, where);
+            MCAutoStringRef t_needle;
+            
+            if (!ctxt . EvalExprAsStringRef(tofind, EE_MARK_BADSTRING, &t_needle))
+                return;
+            
+            if (mark)
+                MCInterfaceExecMarkFind(ctxt, mode, *t_needle, field);
             else
-                MCInterfaceExecUnmarkAllCards(ctxt);
+                MCInterfaceExecUnmarkFind(ctxt, mode, *t_needle, field);
         }
-	else
-    {
-        MCAutoStringRef t_needle;
-
-        if (!ctxt . EvalExprAsStringRef(tofind, EE_MARK_BADSTRING, &t_needle))
-            return;
-
-        if (mark)
-            MCInterfaceExecMarkFind(ctxt, mode, *t_needle, field);
-        else
-            MCInterfaceExecUnmarkFind(ctxt, mode, *t_needle, field);
+        
+        ctxt . IgnoreLastError();
     }
 }
 
