From 48497ddafacfbd50d1da03c47b22eaa1d7b5bbfb Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 28 Feb 2019 22:22:20 -0800 Subject: [PATCH] export cancel icon and removed forced wake of export thread for a more graceful exit --- dialogs/exportdialog.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dialogs/exportdialog.cpp b/dialogs/exportdialog.cpp index f14ea0996..45c457f34 100644 --- a/dialogs/exportdialog.cpp +++ b/dialogs/exportdialog.cpp @@ -566,7 +566,6 @@ void ExportDialog::update_progress_bar(int value, qint64 remaining_ms) { void ExportDialog::cancel_render() { et->continueEncode = false; cancelled = true; - et->wake(); } void ExportDialog::vcodec_changed(int index) { @@ -729,9 +728,8 @@ void ExportDialog::setup_ui() { progressLayout->addWidget(progressBar); renderCancel = new QPushButton(this); - renderCancel->setText("x"); + renderCancel->setIcon(QIcon(":/icons/error.svg")); renderCancel->setEnabled(false); - renderCancel->setMaximumSize(QSize(20, 16777215)); connect(renderCancel, SIGNAL(clicked(bool)), this, SLOT(cancel_render())); progressLayout->addWidget(renderCancel);