Update the value based on the displayUnit (#11825) (#11826)

Fixes #11782
OpenModelica · Jan 18, 2024 · a1eac4e · a1eac4e
1 parent d077a96
commit a1eac4e
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/OMEdit/OMEditLIB/Element/ElementProperties.cpp b/OMEdit/OMEditLIB/Element/ElementProperties.cpp
@@ -1344,18 +1344,17 @@ void ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(Parameter *p
         int index = pParameter->getUnitComboBox()->findData(displayUnit);
         if (index < 0) {
           // add modifier as additional display unit if compatible
-          index = pParameter->getUnitComboBox()->count() - 1;
           OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
-          if (index > -1 &&
-              (pOMCProxy->convertUnits(pParameter->getUnitComboBox()->itemData(0).toString(), displayUnit)).unitsCompatible) {
+          if (pParameter->getUnitComboBox()->count() > 0 && pOMCProxy->convertUnits(pParameter->getUnitComboBox()->itemData(0).toString(), displayUnit).unitsCompatible) {
             pParameter->getUnitComboBox()->addItem(Utilities::convertUnitToSymbol(displayUnit), displayUnit);
-            index++;
+            index = pParameter->getUnitComboBox()->count() - 1;
           }
         }
         if (index > -1) {
-          bool signalsState = pParameter->getUnitComboBox()->blockSignals(true);
+          /* Issue #11782.
+           * Setting the display unit trigger SIGNAL currentIndexChanged and calls SLOT unitComboBoxChanged which will set the correct value.
+           */
           pParameter->getUnitComboBox()->setCurrentIndex(index);
-          pParameter->getUnitComboBox()->blockSignals(signalsState);
           pParameter->setDisplayUnit(displayUnit);
           if (!defaultValue) {
             pParameter->setHasDisplayUnit(true);