From 81da26b590a6babb3639ee616ce578658f33da2f Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Sun, 12 Jul 2020 11:12:33 +0200
Subject: [PATCH] Fixed modified prefs would not always get applied

This is a better fix for the same problem
---
 src/osdep/amiberry.cpp        | 19 -------------------
 src/osdep/gui/PanelConfig.cpp |  1 +
 src/osdep/gui/main_window.cpp |  2 ++
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
index f3a3a0e0..0975022f 100644
--- a/src/osdep/amiberry.cpp
+++ b/src/osdep/amiberry.cpp
@@ -1308,25 +1308,6 @@ void target_reset()
 	auto* const ad = &adisplays;
 	ad->picasso_requested_on = false;
 	ad->picasso_on = false;
-
-	if (currprefs.z3fastmem[0].size != changed_prefs.z3fastmem[0].size)
-	{
-		currprefs.z3fastmem[0].size = changed_prefs.z3fastmem[0].size;
-		z3fastmem_bank[0].reserved_size = 0;
-		z3fastmem_bank[0].mask = 0;
-		z3fastmem_bank[0].baseaddr = NULL;
-
-		mapped_free(&z3fastmem_bank[0]);
-
-		z3fastmem_bank[0].allocated_size = 0;
-		z3fastmem_bank[0].reserved_size = currprefs.z3fastmem[0].size;
-		if (currprefs.z3fastmem[0].size) return;
-
-		z3fastmem_bank[0].mask = currprefs.z3fastmem[0].size - 1;
-		z3fastmem_bank[0].label = _T("*");
-		mapped_malloc(&z3fastmem_bank[0]);
-		changed_prefs.z3fastmem[0].size = currprefs.z3fastmem[0].size;
-	}
 }
 
 bool target_can_autoswitchdevice(void)
diff --git a/src/osdep/gui/PanelConfig.cpp b/src/osdep/gui/PanelConfig.cpp
index e72df4e8..5e5f04e4 100644
--- a/src/osdep/gui/PanelConfig.cpp
+++ b/src/osdep/gui/PanelConfig.cpp
@@ -197,6 +197,7 @@ public:
 				disable_resume();
 			}
 			refresh_all_panels();
+			copy_prefs(&changed_prefs, &currprefs);
 			uae_reset(1, 0);
 			gui_running = false;
 		}
diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp
index e33be9d7..d1510694 100644
--- a/src/osdep/gui/main_window.cpp
+++ b/src/osdep/gui/main_window.cpp
@@ -875,6 +875,7 @@ public:
 			//-------------------------------------------------
 			// Reset Amiga via click on Reset-button
 			//-------------------------------------------------
+			copy_prefs(&changed_prefs, &currprefs);
 			uae_reset(1, 1);
 			gui_running = false;
 		}
@@ -909,6 +910,7 @@ public:
 				//------------------------------------------------
 				// First start of emulator -> reset Amiga
 				//------------------------------------------------
+				copy_prefs(&changed_prefs, &currprefs);
 				uae_reset(0, 1);
 				gui_running = false;
 			}