oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed autorecovery crash and image sequence restore

Browse Source
This commit is contained in:
itsmattkc
2018-12-27 08:13:48 +11:00
parent 47334ae7e2
commit e7393c7ce8
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+14 -12
View File
@@ -171,19 +171,7 @@ MainWindow::MainWindow(QWidget *parent) :
}
}
if (deleted_ars > 0) dout << "[INFO] Deleted" << deleted_ars << "preview" << ((deleted_ars == 1) ? "file that was" : "files that were") << "last read over 30 days ago";
}
// detect auto-recovery file
autorecovery_filename = data_dir + "/autorecovery.ove";
if (QFile::exists(autorecovery_filename)) {
if (QMessageBox::question(NULL, "Auto-recovery", "Olive didn't close properly and an autorecovery file was detected. Would you like to open it?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
updateTitle(autorecovery_filename);
panel_project->load_project(true);
}
}
autorecovery_timer.setInterval(60000);
QObject::connect(&autorecovery_timer, SIGNAL(timeout()), this, SLOT(autorecover_interval()));
autorecovery_timer.start();
// search for open recents list
recent_proj_file = data_dir + "/recents";
@@ -213,6 +201,20 @@ MainWindow::MainWindow(QWidget *parent) :
panel_effect_controls = new EffectControls(this);
panel_timeline = new Timeline(this);
if (!data_dir.isEmpty()) {
// detect auto-recovery file
autorecovery_filename = data_dir + "/autorecovery.ove";
if (QFile::exists(autorecovery_filename)) {
if (QMessageBox::question(NULL, "Auto-recovery", "Olive didn't close properly and an autorecovery file was detected. Would you like to open it?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
updateTitle(autorecovery_filename);
panel_project->load_project(true);
}
}
autorecovery_timer.setInterval(60000);
QObject::connect(&autorecovery_timer, SIGNAL(timeout()), this, SLOT(autorecover_interval()));
autorecovery_timer.start();
}
setup_layout(false);
init_audio();