From 6232cebe002bf5c289352a9da4d96ab574d15955 Mon Sep 17 00:00:00 2001
From: Kilrah <kilrah@andrebernet.ch>
Date: Thu, 26 Mar 2020 17:45:19 +0100
Subject: [PATCH] Fix "Remember simulator switch values"

---
 companion/src/simulation/simulatorwidget.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp
index 798c8664b..7a457c228 100644
--- a/companion/src/simulation/simulatorwidget.cpp
+++ b/companion/src/simulation/simulatorwidget.cpp
@@ -680,12 +680,14 @@ void SimulatorWidget::setupJoysticks()
 void SimulatorWidget::restoreRadioWidgetsState()
 {
   // All RadioWidgets
-  RadioWidget::RadioWidgetState state;
-  QList<QByteArray> states = g.profile[radioProfileId].simulatorOptions().controlsState;
-  foreach (QByteArray ba, states) {
-    QDataStream stream(ba);
-    stream >> state;
-    emit widgetStateChange(state);
+  if (g.simuSW()) {
+    RadioWidget::RadioWidgetState state;
+    QList<QByteArray> states = g.profile[radioProfileId].simulatorOptions().controlsState;
+    foreach (QByteArray ba, states) {
+      QDataStream stream(ba);
+      stream >> state;
+      emit widgetStateChange(state);
+    }
   }
 
   // Set throttle stick down and locked, side depends on mode
@@ -700,8 +702,10 @@ void SimulatorWidget::saveRadioWidgetsState(QList<QByteArray> & state)
 {
   if (m_radioWidgets.size()) {
     state.clear();
-    foreach (RadioWidget * rw, m_radioWidgets)
-      state.append(rw->getStateData());
+    if (g.simuSW()) {
+      foreach (RadioWidget * rw, m_radioWidgets)
+        state.append(rw->getStateData());
+    }
   }
 }