[[ Bug 12071 ]] answer color parameter evaluation too strict

runrevali · runrevali · commit 5e07c6da1f1a · 2014-04-01T12:37:20.000+01:00
diff --git a/docs/notes/bugfix-12071.md b/docs/notes/bugfix-12071.md
@@ -0,0 +1 @@
+# hiliteColor and borderColor is not working in 7.0DP1
diff --git a/engine/src/answer.cpp b/engine/src/answer.cpp
@@ -318,8 +318,8 @@ void MCAnswer::exec_ctxt(MCExecContext& ctxt)
 			MCColor t_initial_color;
 			MCColor *t_initial_color_ptr = &t_initial_color;
 			
-            if (!ctxt . EvalOptionalExprAsColor(colour . initial, nil, EE_ANSWER_BADQUESTION, t_initial_color_ptr))
-                return;
+            // AL-2014-04-01: [[ Bug 12071 ]] If the intial color is empty (i.e. unset), pass nil ptr to dialog.
+            ctxt . TryToEvalOptionalExprAsColor(colour . initial, nil, EE_ANSWER_BADQUESTION, t_initial_color_ptr);
             
 			MCDialogExecAnswerColor(ctxt, t_initial_color_ptr, *t_title, sheet == True);
 			break;
diff --git a/engine/src/exec.cpp b/engine/src/exec.cpp
@@ -1222,6 +1222,25 @@ bool MCExecContext::EvalOptionalExprAsColor(MCExpression *p_expr, MCColor *p_def
     return EvalExprAsColor(p_expr, p_error, *r_value);
 }
 
+// AL-2014-04-01: [[ Bug 12071 ]] Need to be able to fail to eval color without throwing an error.
+void MCExecContext::TryToEvalOptionalExprAsColor(MCExpression *p_expr, MCColor *p_default, Exec_errors p_error, MCColor *&r_value)
+{
+	if (p_expr == nil)
+	{
+		r_value = p_default;
+		return;
+    }
+    
+    // Makes sure the return parameter isn't a nil pointer
+    MCAssert(r_value != nil);
+    
+    if (EvalExprAsColor(p_expr, p_error, *r_value))
+        return;
+    
+    IgnoreLastError();
+    r_value = nil;
+}
+
 bool MCExecContext::EvalExprAsRectangle(MCExpression *p_expr, Exec_errors p_error, MCRectangle& r_value)
 {
 	MCAssert(p_expr != nil);
diff --git a/engine/src/exec.h b/engine/src/exec.h
@@ -1678,6 +1678,7 @@ class MCExecContext
     bool EvalOptionalExprAsRectangle(MCExpression *expr, MCRectangle *default_value, Exec_errors error, MCRectangle *&r_rectangle);
     
 	void TryToEvalExprAsArrayRef(MCExpression *p_expr, Exec_errors p_error, MCArrayRef& r_value);
+    void TryToEvalOptionalExprAsColor(MCExpression *p_expr, MCColor *p_default, Exec_errors p_error, MCColor *&r_value);
     
 private:
 #ifdef LEGACY_EXEC

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# hiliteColor and borderColor is not working in 7.0DP1`