From 425f1b79dc09b692d390a7b533301d4d796a38c9 Mon Sep 17 00:00:00 2001 From: Jean-Paul Mari Date: Mon, 8 Oct 2018 01:21:53 -0400 Subject: [PATCH] Fixed a crash legacy issue when emulator launches in Alpine mode without a valid rom --- docs/vj_ReleaseNotes.txt | 4 +++- src/gui/mainwin.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/vj_ReleaseNotes.txt b/docs/vj_ReleaseNotes.txt index 6fa36f0..70c4756 100644 --- 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 32) Improve source code file reading to avoid additional text/bytes reading 33) Help & content texts updates +34) Fixed a crash legacy issue when emulator launches in Alpine mode without a valid rom Release 3 (13th November 2017) ------------------------------ @@ -161,7 +162,8 @@ Known issues 2) The BPM (Breapoint) remains stuck on his address when user wants to continue the code execution -- Need to trace over the BPM or unset the BPM -- The issue can be prevented if the code doesn't set IRQ, otherwise the IRQ will need to be traced to get back control -3) To support DWARF 2 with GCC, the code must be compiled with the -gdwarf-2 option +3) To support DWARF 2 +-- With GCC: the code must be compiled with the -gdwarf-2 option 4) The Local and Watch variables window may display not available type information or empty information -- Such missing information may be included in future release -- The 'const' type may not be reported correctly in the DWARF information diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp index 7b14d7e..ff0e195 100644 --- a/src/gui/mainwin.cpp +++ b/src/gui/mainwin.cpp @@ -1075,7 +1075,7 @@ static uint32_t ntscTickCount; // Otherwise, run the Jaguar simulation HandleGamepads(); JaguarExecuteNew(); - if (!vjs.softTypeDebugger) + //if (!vjs.softTypeDebugger) videoWidget->HandleMouseHiding(); static uint32_t refresh = 0; @@ -1140,7 +1140,7 @@ void MainWin::TogglePowerState(void) if (!powerButtonOn) { // Restore the mouse pointer, if hidden: - if (!vjs.softTypeDebugger) + //if (!vjs.softTypeDebugger) { videoWidget->CheckAndRestoreMouseCursor(); } @@ -1410,8 +1410,8 @@ void MainWin::LoadSoftware(QString file) } else { - // Prevent the Alpine mode to crash in case of software without a start address - if (vjs.hardwareTypeAlpine && !jaguarRunAddress) + // Prevent the launch in case of software without a start address and without BIOS presence + if (!vjs.useJaguarBIOS && !jaguarRunAddress) { ToggleRunState(); } -- 2.20.1