Revert torrent thread back to local var to fix crashing issue; re-rel…

…ease 1.1.0
kz26 · Dec 9, 2013 · 99697f3 · 99697f3
1 parent ee764f8
commit 99697f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/creationpage.cpp b/creationpage.cpp
@@ -61,15 +61,11 @@ void CreationPage::triggerFinished() {
     emit completeChanged();
 }
 
-void CreationPage::killThread() {
-    this->ctThread->exit();
-}
-
 void CreationPage::initializePage() {
-    this->ctThread = new CreateTorrent(this);
-    connect(this->ctThread, SIGNAL(updateProgress(int)), this, SLOT(updateProgress(int)));
-    connect(this->ctThread, SIGNAL(logStatusMessage(QString)), this, SLOT(logAddedFile(QString)));
-    connect(this->ctThread, SIGNAL(finished()), this, SLOT(triggerFinished()));
+    CreateTorrent *ctThread = new CreateTorrent(this);
+    connect(ctThread, SIGNAL(updateProgress(int)), this, SLOT(updateProgress(int)));
+    connect(ctThread, SIGNAL(logStatusMessage(QString)), this, SLOT(logAddedFile(QString)));
+    connect(ctThread, SIGNAL(finished()), this, SLOT(triggerFinished()));
 
     using namespace libtorrent;
 
@@ -84,5 +80,5 @@ void CreationPage::initializePage() {
     else
         pieceSize = 1024 * (2 << (pieceSizeIndex + 2));
 
-    this->ctThread->makeTorrentFiles(field("inputPath").toString(), field("outputPath").toString(), field("batchMode").toBool(), field("announceUrls").toString(), field("webSeeds").toString(), field("comment").toString(), QString("%1 %2").arg(PROGRAM_NAME, PROGRAM_VERSION), pieceSize, flags, field("privateTorrent").toBool());
+    ctThread->makeTorrentFiles(field("inputPath").toString(), field("outputPath").toString(), field("batchMode").toBool(), field("announceUrls").toString(), field("webSeeds").toString(), field("comment").toString(), QString("%1 %2").arg(PROGRAM_NAME, PROGRAM_VERSION), pieceSize, flags, field("privateTorrent").toBool());
 }
diff --git a/creationpage.h b/creationpage.h
@@ -42,13 +42,9 @@ class CreationPage : public QWizardPage
     void initializePage();
     bool isComplete() const;
 
-public slots:
-    void killThread();
-
 private:
     Ui::CreationPage *ui;
     bool torrentDone;
-    CreateTorrent *ctThread;
 
 private slots:
     void updateProgress(int i);

diff --git a/wizard.cpp b/wizard.cpp
@@ -48,9 +48,7 @@ Wizard::Wizard(QWidget *parent) :
     this->addPage(new TrackersPage);
     this->addPage(new PropertiesPage);
     this->addPage(new SummaryPage);
-    CreationPage *creationPage = new CreationPage;
-    connect(this, SIGNAL(rejected()), creationPage, SLOT(killThread()));
-    this->addPage(creationPage);
+    this->addPage(new CreationPage);
     this->setOption(this->DisabledBackButtonOnLastPage, true);
 }