oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

export cancel icon and removed forced wake of export thread for a more graceful exit

Browse Source
This commit is contained in:
itsmattkc
2019-02-28 22:22:20 -08:00
parent 6c166a1a4e
commit 48497ddafa
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/exportdialog.cpp
+1 -3
View File
@@ -566,7 +566,6 @@ void ExportDialog::update_progress_bar(int value, qint64 remaining_ms) {
void ExportDialog::cancel_render() { void ExportDialog::cancel_render() {
et->continueEncode = false; et->continueEncode = false;
cancelled = true; cancelled = true;
et->wake();
} }
void ExportDialog::vcodec_changed(int index) { void ExportDialog::vcodec_changed(int index) {
@@ -729,9 +728,8 @@ void ExportDialog::setup_ui() {
progressLayout->addWidget(progressBar); progressLayout->addWidget(progressBar);
renderCancel = new QPushButton(this); renderCancel = new QPushButton(this);
renderCancel->setText("x"); renderCancel->setIcon(QIcon(":/icons/error.svg"));
renderCancel->setEnabled(false); renderCancel->setEnabled(false);
renderCancel->setMaximumSize(QSize(20, 16777215));
connect(renderCancel, SIGNAL(clicked(bool)), this, SLOT(cancel_render())); connect(renderCancel, SIGNAL(clicked(bool)), this, SLOT(cancel_render()));
progressLayout->addWidget(renderCancel); progressLayout->addWidget(renderCancel);