Fixed a crash legacy issue when emulator launches in Alpine mode without a valid rom

diff --git a/docs/vj_ReleaseNotes.txt b/docs/vj_ReleaseNotes.txt
index 6fa36f0..70c4756 100644 (file)
--- a/docs/vj_ReleaseNotes.txt
+++ b/docs/vj_ReleaseNotes.txt
@@ -64,6 +64,7 @@ Git commit: TBD
 31) Added a sorting filter in the all watches window\r
 32) Improve source code file reading to avoid additional text/bytes reading\r
 33) Help & content texts updates\r
 31) Added a sorting filter in the all watches window\r
 32) Improve source code file reading to avoid additional text/bytes reading\r
 33) Help & content texts updates\r

+34) Fixed a crash legacy issue when emulator launches in Alpine mode without a valid rom\r

 \r
 Release 3 (13th November 2017)\r
 ------------------------------\r
 \r
 Release 3 (13th November 2017)\r
 ------------------------------\r


@@ -161,7 +162,8 @@ Known issues
 2) The BPM (Breapoint) remains stuck on his address when user wants to continue the code execution\r
 -- Need to trace over the BPM or unset the BPM\r
 -- The issue can be prevented if the code doesn't set IRQ, otherwise the IRQ will need to be traced to get back control\r
 2) The BPM (Breapoint) remains stuck on his address when user wants to continue the code execution\r
 -- Need to trace over the BPM or unset the BPM\r
 -- The issue can be prevented if the code doesn't set IRQ, otherwise the IRQ will need to be traced to get back control\r

-3) To support DWARF 2 with GCC, the code must be compiled with the -gdwarf-2 option\r
+3) To support DWARF 2\r
+-- With GCC: the code must be compiled with the -gdwarf-2 option\r

 4) The Local and Watch variables window  may display not available type information or empty information\r
 -- Such missing information may be included in future release\r
 -- The 'const' type may not be reported correctly in the DWARF information \r
 4) The Local and Watch variables window  may display not available type information or empty information\r
 -- Such missing information may be included in future release\r
 -- The 'const' type may not be reported correctly in the DWARF information \r

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 7b14d7e..ff0e195 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -1075,7 +1075,7 @@ static uint32_t ntscTickCount;
                // Otherwise, run the Jaguar simulation\r
                HandleGamepads();\r
                JaguarExecuteNew();\r
                // Otherwise, run the Jaguar simulation\r
                HandleGamepads();\r
                JaguarExecuteNew();\r

-               if (!vjs.softTypeDebugger)\r
+               //if (!vjs.softTypeDebugger)\r

                        videoWidget->HandleMouseHiding();\r
 \r
 static uint32_t refresh = 0;\r
                        videoWidget->HandleMouseHiding();\r
 \r
 static uint32_t refresh = 0;\r


@@ -1140,7 +1140,7 @@ void MainWin::TogglePowerState(void)
        if (!powerButtonOn)\r
        {\r
                // Restore the mouse pointer, if hidden:\r
        if (!powerButtonOn)\r
        {\r
                // Restore the mouse pointer, if hidden:\r

-               if (!vjs.softTypeDebugger)\r
+               //if (!vjs.softTypeDebugger)\r

                {\r
                        videoWidget->CheckAndRestoreMouseCursor();\r
                }\r
                {\r
                        videoWidget->CheckAndRestoreMouseCursor();\r
                }\r


@@ -1410,8 +1410,8 @@ void MainWin::LoadSoftware(QString file)
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-               // Prevent the Alpine mode to crash in case of software without a start address\r
-               if (vjs.hardwareTypeAlpine && !jaguarRunAddress)\r
+               // Prevent the launch in case of software without a start address and without BIOS presence\r
+               if (!vjs.useJaguarBIOS && !jaguarRunAddress)\r

                {\r
                        ToggleRunState();\r
                }\r
                {\r
                        ToggleRunState();\r
                }\r