Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 4 insertions, 5 deletions

diff --git a/Plugins/Printing/printing.cpp b/Plugins/Printing/printing.cpp
index 3591d4b..c24fc89 100644
--- a/Plugins/Printing/printing.cpp
+++ b/Plugins/Printing/printing.cpp
@@ -57,7 +57,6 @@ void Printing::deinit()
     safe_delete(printDataAction);
     safe_delete(separatorAction);
     safe_delete(printQueryAction);
-    safe_delete(printDialog);
     Q_CLEANUP_RESOURCE(printing);
 }
 
@@ -76,8 +75,7 @@ void Printing::dataPrintRequested(ExtActionContainer* actionContainer)
         return;
     }
 
-    safe_delete(printDialog);
-    printDialog = new QPrintDialog(MAINWINDOW);
+    QPrintDialog* printDialog = new QPrintDialog(MAINWINDOW);
     if (printDialog->exec() != QDialog::Accepted)
         return;
 
@@ -90,6 +88,7 @@ void Printing::dataPrintRequested(ExtActionContainer* actionContainer)
 
     ExportWorker* worker = new ExportWorker(printingExport, printingConfig, nullptr);
     worker->prepareExportQueryResults(db, query);
+    connect(worker, SIGNAL(finished(bool,QIODevice*)), printDialog, SLOT(deleteLater()));
     QThreadPool::globalInstance()->start(worker);
 }
 
@@ -102,8 +101,7 @@ void Printing::queryPrintRequested(ExtActionContainer* actionContainer)
         return;
     }
 
-    safe_delete(printDialog);
-    printDialog = new QPrintDialog(MAINWINDOW);
+    QPrintDialog* printDialog = new QPrintDialog(MAINWINDOW);
     if (printDialog->exec() != QDialog::Accepted)
         return;
 
@@ -111,4 +109,5 @@ void Printing::queryPrintRequested(ExtActionContainer* actionContainer)
 
     QTextDocument* doc = editor->getEditor()->document();
     doc->print(printDialog->printer());
+    printDialog->deleteLater();
 }