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

fixed bug causing projects to fail loading from file

Browse Source
This commit is contained in:
itsmattkc
2019-03-24 23:00:54 +11:00
parent efbfca55cd
commit 8befb90748
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
global/global.cpp
+3 -3
View File
@@ -182,6 +182,8 @@ void OliveGlobal::LoadProject(const QString &fn, bool autorecovery)
LoadDialog ld(olive::MainWindow); LoadDialog ld(olive::MainWindow);
ld.open();
LoadThread* lt = new LoadThread(fn, autorecovery); LoadThread* lt = new LoadThread(fn, autorecovery);
connect(&ld, SIGNAL(cancel()), lt, SLOT(cancel())); connect(&ld, SIGNAL(cancel()), lt, SLOT(cancel()));
connect(lt, SIGNAL(success()), &ld, SLOT(accept())); connect(lt, SIGNAL(success()), &ld, SLOT(accept()));
@@ -190,8 +192,6 @@ void OliveGlobal::LoadProject(const QString &fn, bool autorecovery)
connect(lt, SIGNAL(report_progress(int)), &ld, SLOT(setValue(int))); connect(lt, SIGNAL(report_progress(int)), &ld, SLOT(setValue(int)));
lt->start(); lt->start();
ld.exec();
panel_project->ConnectFilterToModel(); panel_project->ConnectFilterToModel();
} }
@@ -366,7 +366,7 @@ void OliveGlobal::set_sequence(SequencePtr s)
panel_timeline->setFocus(); panel_timeline->setFocus();
} }
void OliveGlobal::OpenProjectWorker(const QString& fn, bool autorecovery) { void OliveGlobal::OpenProjectWorker(QString fn, bool autorecovery) {
ClearProject(); ClearProject();
update_project_filename(fn); update_project_filename(fn);
LoadProject(fn, autorecovery); LoadProject(fn, autorecovery);
global/global.h
+1 -1
View File
@@ -343,7 +343,7 @@ private:
* beside the original project file so that it does not overwrite the original and so that the user is not working * beside the original project file so that it does not overwrite the original and so that the user is not working
* on the autorecovery project in Olive's application data directory. * on the autorecovery project in Olive's application data directory.
*/ */
void OpenProjectWorker(const QString& fn, bool autorecovery); void OpenProjectWorker(QString fn, bool autorecovery);
/** /**
* @brief Returns whether a Sequence is currently active or not, and optionally displays a messagebox if not * @brief Returns whether a Sequence is currently active or not, and optionally displays a messagebox if not