fixed faulty project closing code

This commit is contained in:
itsmattkc
2019-03-22 03:48:59 +11:00
parent 22b208143b
commit 1168ecf019
4 changed files with 48 additions and 44 deletions
+3 -6
View File
@@ -37,10 +37,9 @@
#include <QFile>
#include <QTreeWidgetItem>
LoadThread::LoadThread(const QString& filename, bool autorecovery, bool clear) :
LoadThread::LoadThread(const QString& filename, bool autorecovery) :
filename_(filename),
autorecovery_(autorecovery),
clear_(clear),
cancelled_(false)
{
connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
@@ -779,14 +778,12 @@ void LoadThread::success_func() {
counter++;
}
if (clear_) {
olive::Global->update_project_filename(orig_filename);
}
olive::Global->update_project_filename(orig_filename);
} else {
panel_project->add_recent_project(filename_);
}
olive::Global->set_modified(autorecovery_ || !clear_);
olive::Global->set_modified(autorecovery_);
if (open_seq != nullptr) {
olive::Global->set_sequence(open_seq);
}
+1 -2
View File
@@ -35,7 +35,7 @@ class LoadThread : public QThread
{
Q_OBJECT
public:
LoadThread(const QString& filename, bool autorecovery, bool clear);
LoadThread(const QString& filename, bool autorecovery);
void run();
public slots:
void cancel();
@@ -50,7 +50,6 @@ private slots:
void success_func();
private:
bool autorecovery_;
bool clear_;
QString filename_;
bool load_worker(QFile& f, QXmlStreamReader& stream, int type);