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

Merge branch 'master' into feature/Moar-patch-bank-support-part3

Browse source
This commit is contained in:
James Alan Nguyen 2022-05-17 11:36:34 +10:00
commit ec80a2218c
7 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/gui.cpp
View file

@ -1221,9 +1221,9 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
if (!dirExists(workingDirSong)) workingDirSong=getHomeDir();
hasOpened=fileDialog->openLoad(
"Open File",
{"compatible files", "*.fur *.dmf *.mod *.ftm",
{"compatible files", "*.fur *.dmf *.mod",
"all files", ".*"},
"compatible files{.fur,.dmf,.mod,.ftm},.*",
"compatible files{.fur,.dmf,.mod},.*",
workingDirSong,
dpiScale
);
@ -3566,7 +3566,7 @@ bool FurnaceGUI::loop() {
// backup trigger
if (modified) {
if (backupTimer>0) {
backupTimer-=ImGui::GetIO().DeltaTime;
backupTimer=(backupTimer-ImGui::GetIO().DeltaTime);
if (backupTimer<=0) {
backupTask=std::async(std::launch::async,[this]() -> bool {
if (backupPath==curFileName) {