fixed a bunch of multithreaded loading issues and #174

2018-12-20 23:20:00 +11:00
parent 4de524e7fa
commit 9797a3bf4b
16 changed files with 82 additions and 51 deletions
@@ -39,6 +39,7 @@ LoadDialog::LoadDialog(QWidget *parent, bool autorecovery) : QDialog(parent) {

    lt = new LoadThread(this, autorecovery);
    QObject::connect(lt, SIGNAL(success()), this, SLOT(thread_done()));
+	QObject::connect(lt, SIGNAL(error()), this, SLOT(die()));
    QObject::connect(lt, SIGNAL(report_progress(int)), bar, SLOT(setValue(int)));
    lt->start();
 }
@@ -46,8 +47,12 @@ LoadDialog::LoadDialog(QWidget *parent, bool autorecovery) : QDialog(parent) {
 void LoadDialog::cancel() {
    lt->cancel();
    lt->wait();
-    mainWindow->new_project();
-    reject();
+	die();
+}
+
+void LoadDialog::die() {
+	mainWindow->new_project();
+	reject();
 }

 void LoadDialog::thread_done() {