diff --git a/Changelog b/Changelog
index 557a7fd3b..286567f67 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
+    - BUGFIX: Fixed possible crash when deleting a torrent permanently
+
 * Wed Oct 29th 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
     - FEATURE: Torrent queueing system (with priorities)
     - FEATURE: The number of DHT nodes is displayed
diff --git a/src/deleteThread.h b/src/deleteThread.h
index 02242fa3b..fc4610e09 100644
--- a/src/deleteThread.h
+++ b/src/deleteThread.h
@@ -42,8 +42,8 @@ class subDeleteThread : public QThread {
     }
 
     ~subDeleteThread(){
+      wait();
       qDebug("subDeleteThread successfuly deleted");
-      //wait();
     }
 
   signals:
@@ -58,8 +58,8 @@ class subDeleteThread : public QThread {
       else
         emit deletionFailureST(this);*/
       arb->removeFromFS(save_path);
-      emit deletionSuccessST(this);
       delete arb;
+      emit deletionSuccessST(this);
     }
 };