otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix backup behavior when backup is open

Browse source
This commit is contained in:
tildearrow 2023-04-06 16:08:06 -05:00
parent f80e070178
commit b8667fc29a
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/gui.cpp
View file

@ -5470,13 +5470,17 @@ bool FurnaceGUI::loop() {
backupTimer=(backupTimer-ImGui::GetIO().DeltaTime); backupTimer=(backupTimer-ImGui::GetIO().DeltaTime);
if (backupTimer<=0) { if (backupTimer<=0) {
backupTask=std::async(std::launch::async,[this]() -> bool { backupTask=std::async(std::launch::async,[this]() -> bool {
logV("backupPath: %s",backupPath);
logV("curFileName: %s",curFileName);
if (curFileName.find(backupPath)==0) { if (curFileName.find(backupPath)==0) {
logD("backup file open. not saving backup."); logD("backup file open. not saving backup.");
backupTimer=30.0;
return true; return true;
} }
if (!dirExists(backupPath.c_str())) { if (!dirExists(backupPath.c_str())) {
if (!makeDir(backupPath.c_str())) { if (!makeDir(backupPath.c_str())) {
logW("could not create backup directory!"); logW("could not create backup directory!");
backupTimer=30.0;
return false; return false;
} }
} }
@ -5959,7 +5963,11 @@ bool FurnaceGUI::init() {
} }
strncpy(finalLayoutPath,(e->getConfigPath()+String(LAYOUT_INI)).c_str(),4095); strncpy(finalLayoutPath,(e->getConfigPath()+String(LAYOUT_INI)).c_str(),4095);
backupPath=e->getConfigPath()+String(BACKUPS_DIR); backupPath=e->getConfigPath();
if (backupPath.size()>0) {
if (backupPath[backupPath.size()-1]==DIR_SEPARATOR) backupPath.resize(backupPath.size()-1);
}
backupPath+=String(BACKUPS_DIR);
prepareLayout(); prepareLayout();
ImGui::GetIO().ConfigFlags|=ImGuiConfigFlags_DockingEnable; ImGui::GetIO().ConfigFlags|=ImGuiConfigFlags_DockingEnable;