From 5f252530cd37c4a1558b532f681fd8871aeb010f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 15 Dec 2018 01:38:05 +0100 Subject: [PATCH] Minor fixes in simulator selector --- src/blackgui/components/simulatorselector.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/blackgui/components/simulatorselector.cpp b/src/blackgui/components/simulatorselector.cpp index 31fe9106a..67960a80c 100644 --- a/src/blackgui/components/simulatorselector.cpp +++ b/src/blackgui/components/simulatorselector.cpp @@ -125,7 +125,7 @@ namespace BlackGui void CSimulatorSelector::setToLastSelection() { - const CSimulatorInfo simulator = (m_mode == RadioButtons || m_mode == CheckBoxes) ? + const CSimulatorInfo simulator = (m_mode == RadioButtons || m_mode == ComboBox) ? m_currentSimulator.get() : m_currentSimulators.get(); this->setValue(simulator); @@ -136,9 +136,10 @@ namespace BlackGui if (sGui && sGui->supportsContexts() && sGui->getIContextSimulator()) { const CSimulatorPluginInfo pluginInfo = sGui->getIContextSimulator()->getSimulatorPluginInfo(); + if (!this->isSingleSelection()) { this->setMode(RadioButtons); } + if (pluginInfo.isValid()) { - this->setMode(RadioButtons); this->setReadOnly(makeReadOnly); this->setValue(pluginInfo.getSimulator()); }