From: Jean-Paul Mari <djipi.mari@gmail.com>
Date: Mon, 4 Dec 2017 07:09:06 +0000 (-0500)
Subject: The zoom value setting has been fixed in the registry
X-Git-Tag: v2.1.3-R4~53
X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/commitdiff_plain/879b84c52caeedbaf0c29469363e080b91bf5527

The zoom value setting has been fixed in the registry
---

diff --git a/docs/vj_ReleaseNotes.txt b/docs/vj_ReleaseNotes.txt
index 8ffe37b..33283c4 100644
--- a/docs/vj_ReleaseNotes.txt
+++ b/docs/vj_ReleaseNotes.txt
@@ -1,3 +1,7 @@
+Release 4 (TBD)
+---------------
+0) The zoom value setting has been fixed in the registry
+
 Release 3 (13th November 2017)
 ------------------------------
 0) Fixed the windows respawning in the next emulator launch within --alpine or --debugger options
diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 1af385a..47448e5 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -1651,7 +1651,7 @@ void MainWin::ReadSettings(void)
 
 	QSettings settings("Underground Software", "Virtual Jaguar");
 
-	zoomLevel = settings.value("zoom", 2).toInt();
+	//zoomLevel = settings.value("zoom", 2).toInt();
 	allowUnknownSoftware = settings.value("showUnknownSoftware", false).toBool();
 	lastEditedProfile = settings.value("lastEditedProfile", 0).toInt();
 
@@ -1786,6 +1786,9 @@ void MainWin::ReadUISettings(void)
 	pos = settings.value("cartLoadPos", QPoint(200, 200)).toPoint();
 	filePickWin->move(pos);
 
+	// Video output information
+	zoomLevel = settings.value("zoom", 2).toInt();
+
 	// Alpine debug UI information (also needed by the Debugger)
 	if (vjs.hardwareTypeAlpine || vjs.softTypeDebugger)
 	{
@@ -1903,7 +1906,7 @@ void MainWin::WriteSettings(void)
 	//settings.setValue("size", size());
 	//settings.setValue("cartLoadPos", filePickWin->pos());
 
-	settings.setValue("zoom", zoomLevel);
+	//settings.setValue("zoom", zoomLevel);
 	settings.setValue("showUnknownSoftware", allowUnknownSoftware);
 	settings.setValue("lastEditedProfile", lastEditedProfile);
 
@@ -2017,6 +2020,8 @@ void MainWin::WriteUISettings(void)
 	settings.setValue("pos", pos());
 	settings.setValue("size", size());
 	settings.setValue("cartLoadPos", filePickWin->pos());
+
+	// Video output information
 	settings.setValue("zoom", zoomLevel);
 
 	// Alpine debug UI information (also needed by the Debugger)