colordialog: if display changes, ensure views change before anything else

Prevents exception if new display doesn't contain current view.
2020-05-05 00:42:55 +10:00
parent b80eb6fd45
commit 30efe054c7
1 changed files with 4 additions and 1 deletions
@@ -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());
  }