From 2076d0b2c5e1e9f4fdb941d310a871922cbb69b2 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:46:32 -0700 Subject: [PATCH] exportdialog: ignore preset combobox change when loading presets --- app/dialog/export/export.cpp | 11 ++++++++++- app/dialog/export/export.h | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp index e714dfd41..94bc6fedf 100644 --- a/app/dialog/export/export.cpp +++ b/app/dialog/export/export.cpp @@ -47,7 +47,8 @@ namespace olive { ExportDialog::ExportDialog(ViewerOutput *viewer_node, bool stills_only_mode, QWidget *parent) : super(parent), viewer_node_(viewer_node), - stills_only_mode_(stills_only_mode) + stills_only_mode_(stills_only_mode), + loading_presets_(false) { QHBoxLayout* layout = new QHBoxLayout(this); @@ -432,6 +433,10 @@ void ExportDialog::SavePreset() void ExportDialog::PresetComboBoxChanged() { + if (loading_presets_) { + return; + } + QComboBox *c = static_cast(sender()); int preset_number = c->currentData().toInt(); @@ -536,6 +541,8 @@ void ExportDialog::ResolutionChanged() void ExportDialog::LoadPresets() { + loading_presets_ = true; + preset_combobox_->clear(); presets_.clear(); @@ -562,6 +569,8 @@ void ExportDialog::LoadPresets() f.close(); } } + + loading_presets_ = false; } void ExportDialog::SetDefaultFilename() diff --git a/app/dialog/export/export.h b/app/dialog/export/export.h index 307e8b0d4..594b16380 100644 --- a/app/dialog/export/export.h +++ b/app/dialog/export/export.h @@ -125,6 +125,8 @@ private: bool stills_only_mode_; + bool loading_presets_; + private slots: void BrowseFilename();