From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 9 Feb 2017 04:36:04 -0500 Subject: Imported Upstream version 3.1.1+dfsg1 --- Plugins/Printing/printing.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Plugins/Printing/printing.cpp') 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(); } -- cgit v1.2.3