Turn MCtracedobject into an object handle

livecodefraser · livecodefraser · commit 34bf1f2c6565 · 2016-10-26T17:14:04.000+01:00
Conflicts:
	engine/src/debug.cpp
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -49,7 +49,7 @@ MCStackHandle MCtracestackptr;
 Window MCtracewindow;
 Boolean MCtrace;
 Boolean MCtraceabort;
-MCObject *MCtracedobject;
+MCObjectHandle MCtracedobject;
 Boolean MCtracereturn = True;
 uint4 MCtraceuntil = MAXUINT2;
 uint2 MCtracedelay = 500;
@@ -205,8 +205,8 @@ void MCB_message(MCExecContext &ctxt, MCNameRef mess, MCParameter *p)
 			MCU_resetprops(True);
 			MCscreen->wait(REFRESH_INTERVAL, True, True);
 		}
-		//  depth--;
-		if (MCtracedobject == NULL)
+		
+        if (!MCtracedobject)
 			MCtracedobject = ctxt.GetObject();
 		if (MCtraceabort)
 		{
diff --git a/engine/src/debug.h b/engine/src/debug.h
@@ -17,6 +17,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef __MC_DEBUG_H__
 #define __MC_DEBUG_H__
 
+#include "object.h"
 #include "stack.h"
 
 //
@@ -51,7 +52,7 @@ extern Window MCtracewindow;
 extern Boolean MCtrace;
 extern Boolean MCtraceabort;
 extern Boolean MCtracereturn;
-extern MCObject *MCtracedobject;
+extern MCObjectHandle MCtracedobject;
 extern uint2 MCtracedelay;
 extern uint4 MCtraceuntil;
 
diff --git a/engine/src/dskmain.cpp b/engine/src/dskmain.cpp
@@ -332,10 +332,10 @@ void X_main_loop_iteration()
 	// MW-2011-08-19: [[ Redraw ]] Make sure we flush any updates.
 	MCRedrawUpdateScreen();
 	MCabortscript = False;
-	if (MCtracedobject != NULL)
+	if (MCtracedobject)
 	{
 		MCtracedobject->message(MCM_trace_done);
-		MCtracedobject = NULL;
+		MCtracedobject = nil;
 	}
     if (!MCtodestroy -> isempty())
     {

Original file line number	Diff line number	Diff line change
`@@ -332,10 +332,10 @@ void X_main_loop_iteration()`
`332`	`332`	`// MW-2011-08-19: [[ Redraw ]] Make sure we flush any updates.`
`333`	`333`	`MCRedrawUpdateScreen();`
`334`	`334`	`MCabortscript = False;`
`335`		`- if (MCtracedobject != NULL)`
	`335`	`+ if (MCtracedobject)`
`336`	`336`	`{`
`337`	`337`	`MCtracedobject->message(MCM_trace_done);`
`338`		`- MCtracedobject = NULL;`
	`338`	`+ MCtracedobject = nil;`
`339`	`339`	`}`
`340`	`340`	`if (!MCtodestroy -> isempty())`
`341`	`341`	`{`