[[ Bug 16118 ]] Fix some mismatched MCerrordialog increments

livecodeali · livecodeali · commit a5a3507cd9b4 · 2015-10-05T23:30:18.000+01:00
diff --git a/docs/notes/bugfix-16118.md b/docs/notes/bugfix-16118.md
@@ -0,0 +1 @@
+# Error dialog doesn't open correctly in some circumstances
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -2989,6 +2989,7 @@ void MCSubwindow::exec_ctxt(MCExecContext &ctxt)
 					else
 						MCInterfaceExecDrawerStack(ctxt, (MCStack *)optr, *t_parent_name, thisstack == True, t_pos, t_align);
 				}
+                MCerrorlock--;
 				break;
 			}
 		case WM_PULLDOWN:
diff --git a/engine/src/exec-strings.cpp b/engine/src/exec-strings.cpp
@@ -2545,6 +2545,7 @@ void MCStringsExecSort(MCExecContext& ctxt, Sort_type p_dir, Sort_type p_form, M
             if (MCValueGetTypeCode(t_temp_items[i]) != kMCValueTypeCodeString)
                 t_all_strings = false;
         }
+        MCerrorlock--;
         t_items = t_temp_items;
     }
     else
diff --git a/engine/src/gradient.cpp b/engine/src/gradient.cpp
@@ -448,10 +448,10 @@ bool MCGradientFillGetProperties(MCExecContext& ctxt, MCGradientFill* p_gradient
             t_success = MCArrayStoreValue(*v, kMCCompareExact, *t_key, t_prop_value);
     }
     
+    MCerrorlock--;
+    
     if (t_success)
     {
-        MCerrorlock--;
-        
         r_value . arrayref_value = MCValueRetain(*v);
         r_value . type = kMCExecValueTypeArrayRef;
         return true;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Error dialog doesn't open correctly in some circumstances`
Original file line number	Diff line number	Diff line change
`@@ -2989,6 +2989,7 @@ void MCSubwindow::exec_ctxt(MCExecContext &ctxt)`
`2989`	`2989`	`else`
`2990`	`2990`	`MCInterfaceExecDrawerStack(ctxt, (MCStack )optr, t_parent_name, thisstack == True, t_pos, t_align);`
`2991`	`2991`	`}`
	`2992`	`+ MCerrorlock--;`
`2992`	`2993`	`break;`
`2993`	`2994`	`}`
`2994`	`2995`	`case WM_PULLDOWN:`
Original file line number	Diff line number	Diff line change
`@@ -2545,6 +2545,7 @@ void MCStringsExecSort(MCExecContext& ctxt, Sort_type p_dir, Sort_type p_form, M`
`2545`	`2545`	`if (MCValueGetTypeCode(t_temp_items[i]) != kMCValueTypeCodeString)`
`2546`	`2546`	`t_all_strings = false;`
`2547`	`2547`	`}`
	`2548`	`+ MCerrorlock--;`
`2548`	`2549`	`t_items = t_temp_items;`
`2549`	`2550`	`}`
`2550`	`2551`	`else`
Original file line number	Diff line number	Diff line change
`@@ -448,10 +448,10 @@ bool MCGradientFillGetProperties(MCExecContext& ctxt, MCGradientFill* p_gradient`
`448`	`448`	`t_success = MCArrayStoreValue(v, kMCCompareExact, t_key, t_prop_value);`
`449`	`449`	`}`
`450`	`450`
	`451`	`+ MCerrorlock--;`
	`452`	`+`
`451`	`453`	`if (t_success)`
`452`	`454`	`{`
`453`		`- MCerrorlock--;`
`454`		`-`
`455`	`455`	`r_value . arrayref_value = MCValueRetain(*v);`
`456`	`456`	`r_value . type = kMCExecValueTypeArrayRef;`
`457`	`457`	`return true;`