Disable also JIT FPU when JIT is not enabled.

diff --git a/main.cpp b/main.cpp
index 86f29743c1cd539f194804e44158acd2632dcce4..b434935564cbeb3cce2b26b49745cbdc0931b59a 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -304,7 +304,7 @@ void fixup_cpu (struct uae_prefs *p)
                p->cachesize = 0;
                error_log (_T("JIT requires 68020 or better CPU."));
        }
-       if (p->fpu_model == 0 && p->compfpu) {
+       if ((p->fpu_model == 0 || !p->cachesize) && p->compfpu) {
                p->compfpu = false;
        }
 

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 99d22c8b3d849e62d5d8eb82a4bdb5862d515af5..a1998c7b709d36c14e45e375213cc3704afdd3a4 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -13911,6 +13911,8 @@ static void values_from_cpudlg(HWND hDlg, WPARAM wParam)
        }
        if (!workprefs.cachesize) {
                setchecked (hDlg, IDC_JITENABLE, false);
+               workprefs.compfpu = false;
+               setchecked(hDlg, IDC_JITFPU, false);
        }
        if (workprefs.cachesize && workprefs.compfpu && workprefs.fpu_mode > 0) {
                workprefs.fpu_mode = 0;