From: Jean-Paul Mari <djipi.mari@gmail.com>
Date: Sun, 5 Aug 2018 00:33:28 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/djipi/Virtual-Jaguar-Rx
X-Git-Tag: v2.1.3-R4~51
X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/commitdiff_plain/ba8e73ab7b8283139ceb9779f58c82936645b38d?hp=a6e49dc3382a8e6478e564bbd501644fa0cd44ed

Merge branch 'master' of https://github.com/djipi/Virtual-Jaguar-Rx
---

diff --git a/Win-VS2017/virtualjaguar.vcxproj b/Win-VS2017/virtualjaguar.vcxproj
index 14377c1..bbba88f 100644
--- a/Win-VS2017/virtualjaguar.vcxproj
+++ b/Win-VS2017/virtualjaguar.vcxproj
@@ -485,10 +485,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp" />
     <ClCompile Include="GeneratedFiles\Release\moc_DSPDasmWin.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
diff --git a/docs/vj_ReleaseNotes.txt b/docs/vj_ReleaseNotes.txt
index 33283c4..7c1fc12 100644
--- a/docs/vj_ReleaseNotes.txt
+++ b/docs/vj_ReleaseNotes.txt
@@ -1,6 +1,7 @@
 Release 4 (TBD)
 ---------------
 0) The zoom value setting has been fixed in the registry
+1) Debugger mode shares the same alpine rom path setting
 
 Release 3 (13th November 2017)
 ------------------------------
diff --git a/src/debugger/debuggertab.cpp b/src/debugger/debuggertab.cpp
index 032db33..c5b3a00 100644
--- a/src/debugger/debuggertab.cpp
+++ b/src/debugger/debuggertab.cpp
@@ -59,6 +59,7 @@ void DebuggerTab::SetSettings(void)
 	bool ok;
 
 	//strcpy(vjs.debuggerROMPath, debuggerTab->edit1->text().toUtf8().data());
+	strcpy(vjs.debuggerROMPath, vjs.alpineROMPath);
 	//strcpy(vjs.absROMPath, debuggerTab->edit2->text().toUtf8().data());
 	vjs.nbrdisasmlines = edit3->text().toUInt(&ok, 10);
 	//vjs.allowWritesToROM = debuggerTab->writeROM->isChecked();