From 864e5dfe76cc108e8312f199358cbfae3b601ee0 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Mon, 6 Jul 2020 18:57:15 +0200 Subject: [PATCH] CPU Panel: changed enabled checkmarks logic You can now click on JIT, and it will disable incompatible options (24-bit addressing and more compatible), instead of the other way around --- src/osdep/gui/PanelCPU.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/osdep/gui/PanelCPU.cpp b/src/osdep/gui/PanelCPU.cpp index 8a14231e..e076232a 100644 --- a/src/osdep/gui/PanelCPU.cpp +++ b/src/osdep/gui/PanelCPU.cpp @@ -183,6 +183,8 @@ public: changed_prefs.compfpu = true; changed_prefs.cpu_cycle_exact = false; changed_prefs.cpu_memory_cycle_exact = false; + changed_prefs.address_space_24 = false; + changed_prefs.cpu_compatible = false; } else { @@ -426,9 +428,10 @@ void RefreshPanelCPU() optCPU68040->setSelected(true); chk24Bit->setSelected(changed_prefs.address_space_24); - chk24Bit->setEnabled(changed_prefs.cpu_model == 68020); + chk24Bit->setEnabled(changed_prefs.cpu_model == 68020 && changed_prefs.cachesize == 0); chkCPUCompatible->setSelected(changed_prefs.cpu_compatible > 0); - chkJIT->setEnabled(!changed_prefs.address_space_24 && !changed_prefs.cpu_compatible && changed_prefs.cpu_model >= 68020); + chkCPUCompatible->setEnabled(changed_prefs.cachesize == 0); + chkJIT->setEnabled(changed_prefs.cpu_model >= 68020); chkJIT->setSelected(changed_prefs.cachesize > 0); switch (changed_prefs.fpu_model)