Ensure LCB handler calls use the correct register mapping

livecodefraser · livecodefraser · commit 941eaa8f37e8 · 2016-09-08T16:44:39.000+01:00
This fixes inout/out parameters misbehaving in some circumstances.
diff --git a/libscript/src/script-execute.hpp b/libscript/src/script-execute.hpp
@@ -900,7 +900,7 @@ MCScriptExecuteContext::PopFrame(uindex_t p_result_reg)
 		}
 		
 		// Now copy back the out parameters - if any.
-		if (m_frame->mapping != nil)
+		if (t_popped_frame->mapping != nil)
 		{
 			for(uindex_t i = 0; i < t_parameter_count; i++)
 			{

Original file line number	Diff line number	Diff line change
`@@ -900,7 +900,7 @@ MCScriptExecuteContext::PopFrame(uindex_t p_result_reg)`
`900`	`900`	`}`
`901`	`901`
`902`	`902`	`// Now copy back the out parameters - if any.`
`903`		`- if (m_frame->mapping != nil)`
	`903`	`+ if (t_popped_frame->mapping != nil)`
`904`	`904`	`{`
`905`	`905`	`for(uindex_t i = 0; i < t_parameter_count; i++)`
`906`	`906`	`{`