X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/blobdiff_plain/44432db55800c792f94183b9038713f8e6f1061b..0e699c1255f04f5c332632eef475ebcef4200305:/src/jaguar.cpp

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index 594495a..4123d4b 100644
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -2612,20 +2612,20 @@ void JaguarExecuteNew(void)
 // Step over function
 int JaguarStepOver(int depth)
 {
-	bool exit;
-	int cycles;
+	bool exit = !depth;
+	int cycles = 0;
 	//bool case55 = false;
 	//uint32_t m68kSR;
 
-	if (!depth)
-	{
-		cycles = 0;
-		exit = true;
-	}
-	else
-	{
-		exit = false;
-	}
+//	if (!depth)
+//	{
+//		cycles = 0;
+//		exit = true;
+//	}
+//	else
+//	{
+//		exit = false;
+//	}
 
 	do
 	{
@@ -2681,7 +2681,7 @@ int JaguarStepOver(int depth)
 			break;
 		}
 	}
-	while (!exit);
+	while (!exit && !M68KDebugHaltStatus());
 
 #ifdef _MSC_VER
 #pragma message("Warning: !!! Need to verify the Jaguar Step Over function !!!")