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
+2 -1
View File
@@ -31,6 +31,7 @@
#include "project/proxygenerator.h"
#include "project/footage.h"
#include "ui/mainwindow.h"
#include "global/global.h"
ProxyDialog::ProxyDialog(QWidget *parent, const QVector<Media*> &media) :
QDialog(parent),
@@ -155,7 +156,7 @@ void ProxyDialog::accept() {
olive::proxy_generator.queue(info_list.at(i));
}
olive::MainWindow->setWindowModified(true);
olive::Global->set_modified(true);
QDialog::accept();
}