merged with master

This commit is contained in:
itsmattkc
2019-03-21 17:22:36 +11:00
46 changed files with 943 additions and 320 deletions
+19 -3
View File
@@ -48,7 +48,9 @@ std::unique_ptr<OliveGlobal> olive::Global;
QString olive::ActiveProjectFilename;
QString olive::AppName;
OliveGlobal::OliveGlobal() {
OliveGlobal::OliveGlobal() :
changed_since_last_autorecovery(false)
{
// sets current app name
QString version_id;
@@ -107,6 +109,17 @@ void OliveGlobal::set_rendering_state(bool rendering) {
}
}
void OliveGlobal::set_modified(bool modified)
{
olive::MainWindow->setWindowModified(modified);
changed_since_last_autorecovery = modified;
}
bool OliveGlobal::is_modified()
{
return olive::MainWindow->isWindowModified();
}
void OliveGlobal::load_project_on_launch(const QString& s) {
olive::ActiveProjectFilename = s;
enable_load_project_on_init = true;
@@ -219,7 +232,7 @@ bool OliveGlobal::save_project() {
}
bool OliveGlobal::can_close_project() {
if (olive::MainWindow->isWindowModified()) {
if (is_modified()) {
QMessageBox* m = new QMessageBox(
QMessageBox::Question,
tr("Unsaved Project"),
@@ -281,8 +294,11 @@ void OliveGlobal::finished_initialize() {
}
void OliveGlobal::save_autorecovery_file() {
if (olive::MainWindow->isWindowModified()) {
if (changed_since_last_autorecovery) {
panel_project->save_project(true);
changed_since_last_autorecovery = false;
qInfo() << "Auto-recovery project saved";
}
}