From 30efe054c70e4b642ffad19f93550ea38d31eca1 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 5 May 2020 00:42:55 +1000 Subject: [PATCH] colordialog: if display changes, ensure views change before anything else Prevents exception if new display doesn't contain current view. --- app/widget/colorwheel/colorspacechooser.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/widget/colorwheel/colorspacechooser.cpp b/app/widget/colorwheel/colorspacechooser.cpp index 78b292098..14a58108c 100644 --- a/app/widget/colorwheel/colorspacechooser.cpp +++ b/app/widget/colorwheel/colorspacechooser.cpp @@ -85,7 +85,6 @@ ColorSpaceChooser::ColorSpaceChooser(ColorManager* color_manager, bool enable_in display_combobox_->setCurrentText(color_manager_->GetDefaultDisplay()); connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::ComboBoxChanged); - connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::UpdateViews); } row++; @@ -184,6 +183,10 @@ void ColorSpaceChooser::UpdateViews(const QString& display) void ColorSpaceChooser::ComboBoxChanged() { + if (sender() == display_combobox_) { + UpdateViews(display_combobox_->currentText()); + } + if (input_combobox_) { emit InputColorSpaceChanged(input()); }