MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid calling doSaveData twice when unloading a world 

This was happening because of a switch to viewscreen_game_cleanerst and back to
viewscreen_savegamest when saving
develop
lethosor 2019-08-23 20:45:35 -04:00
parent 100e584c34
commit 2ef46562c8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/Core.cpp
Unescape Escape View File

@ -138,6 +138,7 @@ struct Core::Private
std::thread hotkeythread; std::thread hotkeythread;
bool last_autosave_request{false}; bool last_autosave_request{false};
bool was_load_save{false};
}; };
struct CommandDepthCounter struct CommandDepthCounter
@ -1967,18 +1968,17 @@ void Core::doUpdate(color_ostream &out, bool first_update)
vs_changed = true; vs_changed = true;
} }
bool is_load_save =
strict_virtual_cast<df::viewscreen_game_cleanerst>(screen) ||
strict_virtual_cast<df::viewscreen_loadgamest>(screen) ||
strict_virtual_cast<df::viewscreen_savegamest>(screen);
// save data (do this before updating last_world_data_ptr and triggering unload events) // save data (do this before updating last_world_data_ptr and triggering unload events)
if ((df::global::ui->main.autosave_request && !d->last_autosave_request) || if ((df::global::ui->main.autosave_request && !d->last_autosave_request) ||
(vs_changed && strict_virtual_cast<df::viewscreen_savegamest>(screen))) (is_load_save && !d->was_load_save && strict_virtual_cast<df::viewscreen_savegamest>(screen)))
{ {
doSaveData(out); doSaveData(out);
} }
d->last_autosave_request = df::global::ui->main.autosave_request;
bool is_load_save =
strict_virtual_cast<df::viewscreen_game_cleanerst>(screen) ||
strict_virtual_cast<df::viewscreen_loadgamest>(screen) ||
strict_virtual_cast<df::viewscreen_savegamest>(screen);
// detect if the game was loaded or unloaded in the meantime // detect if the game was loaded or unloaded in the meantime
void *new_wdata = NULL; void *new_wdata = NULL;
@ -2036,6 +2036,9 @@ void Core::doUpdate(color_ostream &out, bool first_update)
// Execute per-frame handlers // Execute per-frame handlers
onUpdate(out); onUpdate(out);
d->last_autosave_request = df::global::ui->main.autosave_request;
d->was_load_save = is_load_save;
out << std::flush; out << std::flush;
} }