Merge branch 'bugfix-10916' of https://github.com/runrevian/livecode into bugfix-10916

runrevmark · runrevmark · commit 6e0e223f8377 · 2013-05-29T16:02:18.000+01:00
diff --git a/engine/src/objectprops.cpp b/engine/src/objectprops.cpp
@@ -850,6 +850,7 @@ Exec_stat MCObject::setscriptprop(MCExecPoint& ep)
 	else
 	{
 		char *oldscript = script;
+		bool t_old_script_encrypted = m_script_encrypted;
 		if (data.getstring()[length - 1] != '\n')
 		{
 			script = new char[length + 2];
@@ -860,6 +861,8 @@ Exec_stat MCObject::setscriptprop(MCExecPoint& ep)
 		else
 			script = data.clone();
 			
+		// IM-2013-05-29: [[ BZ 10916 ]] flag new script as unencrypted
+		m_script_encrypted = false;
 		getstack() -> securescript(this);
 		
 		flags |= F_SCRIPT;
@@ -873,6 +876,7 @@ Exec_stat MCObject::setscriptprop(MCExecPoint& ep)
 				hlist = NULL;
 				delete script;
 				script = oldscript;
+				m_script_encrypted = t_old_script_encrypted;
 				oldscript = NULL;
 				if (script == NULL)
 					flags &= ~F_SCRIPT;
