pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed modified prefs would not always get applied

Browse source 
This is a better fix for the same problem
This commit is contained in:
Dimitris Panokostas 2020-07-12 11:12:33 +02:00
parent c81267e903
commit 81da26b590
3 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/osdep/amiberry.cpp
View file

@ -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)

1
src/osdep/gui/PanelConfig.cpp
View file

@ -197,6 +197,7 @@ public:
disable_resume();
}
refresh_all_panels();
copy_prefs(&changed_prefs, &currprefs);
uae_reset(1, 0);
gui_running = false;
}

2
src/osdep/gui/main_window.cpp
View file

@ -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;
}