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
+1 -1
View File
@@ -771,7 +771,7 @@ void LoadThread::success_func() {
panel_project->add_recent_project(filename_);
}
olive::MainWindow->setWindowModified(autorecovery_ || !clear_);
olive::Global->set_modified(autorecovery_ || !clear_);
if (open_seq != nullptr) {
olive::Global->set_sequence(open_seq);
}
+2 -1
View File
@@ -39,6 +39,7 @@
#include "project/projectfilter.h"
#include "timeline/sequence.h"
#include "global/config.h"
#include "global/global.h"
#include "dialogs/proxydialog.h"
#include "ui/viewerwidget.h"
#include "project/proxygenerator.h"
@@ -446,5 +447,5 @@ void SourcesCommon::clear_proxies_from_selected() {
panel_sequence_viewer->viewer_widget->frame_update();
}
olive::MainWindow->setWindowModified(true);
olive::Global->set_modified(true);
}