Merge remote-tracking branch 'origin/develop-6.7-gyp' into develop-7.0-gyp

livecodefraser · livecodefraser · commit 229c6f97b1f8 · 2015-06-10T14:46:56.000+01:00
Conflicts:
	engine/src/dispatch.cpp
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -931,8 +931,7 @@ IO_stat MCDispatch::doreadfile(MCStringRef p_openpath, MCStringRef p_name, IO_ha
     {
         MCnoui = True;
         MCscreen = new MCUIDC;
-        /* UNCHECKED */ MCStackSecurityCreateStack(sptr);
-        stacks = sptr;
+        /* UNCHECKED */ MCStackSecurityCreateStack(stacks);
         MCdefaultstackptr = MCstaticdefaultstackptr = stacks;
         stacks->setparent(this);
         stacks->setname_cstring("revScript");
