openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fix bug where manual save overwrote auto

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-03 16:09:52 -05:00
parent 5bbc4dc4b5
commit 796b48f978
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/boe.actions.cpp
View File

@@ -3063,7 +3063,13 @@ void do_load() {
finish_load_party();
if(overall_mode != MODE_STARTUP)
post_load();
univ.file = file_to_load;
extern fs::path store_chose_auto;
if(store_chose_auto.empty()){
univ.file = file_to_load;
}else{
// Make sure when you choose an autosave, your next manual save overwrites the main file, not the autosave.
univ.file = store_chose_auto;
}
menu_activate();
restore_cursor();
}

15
src/game/boe.dlgutil.cpp
View File

@@ -1801,6 +1801,10 @@ scen_header_type pick_a_scen() {
extern fs::path saveDir;
// When loading an autosave, store the main save filename because univ.file should be set to the
// main save. That way, manual saves overwrite the main save, not the specific autosave you choose.
fs::path store_chose_auto;
class cFilePicker {
const int SLOTS_PER_PAGE = 4;
int parties_per_page;
@@ -2000,7 +2004,7 @@ class cFilePicker {
if(std::difftime(mtime, auto_mtimes.front().second) < 0)
me["auto" + suffix + "-more-recent"].show();
me["auto" + suffix].attachClickHandler(std::bind(&cFilePicker::showAuto, this, auto_folder));
me["auto" + suffix].attachClickHandler(std::bind(&cFilePicker::showAuto, this, auto_folder, file));
}
}
}
@@ -2038,10 +2042,12 @@ class cFilePicker {
++pages_populated;
}
bool showAuto(fs::path auto_folder) {
bool showAuto(fs::path auto_folder, fs::path file) {
fs::path autosave = run_autosave_picker(auto_folder, &me);
if(!autosave.empty())
if(!autosave.empty()){
store_chose_auto = file;
doLoad(autosave);
}
return true;
}
@@ -2148,7 +2154,7 @@ public:
me["load" + suffix].attachClickHandler(std::bind(&cFilePicker::doLoad, this, "DUMMY"));
me["save" + suffix].attachClickHandler(std::bind(&cFilePicker::doSave, this, "DUMMY"));
// A click on an autosave button means another dummy file picker should open:
me["auto" + suffix].attachClickHandler(std::bind(&cFilePicker::showAuto, this, ""));
me["auto" + suffix].attachClickHandler(std::bind(&cFilePicker::showAuto, this, "", ""));
}
}
@@ -2182,6 +2188,7 @@ fs::path fancy_file_picker(bool saving) {
fs::path run_file_picker(bool saving){
if(has_feature_flag("file-picker-dialog", "V1") && get_bool_pref("FancyFilePicker", true)){
store_chose_auto = "";
return fancy_file_picker(saving);
}