diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index ca015d2dc..c96774dca 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -45,7 +45,7 @@
- 1
+ 2
@@ -61,22 +61,40 @@
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
5
4
-
- 0
-
-
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
@@ -728,6 +746,19 @@ Mode 4:
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Startup Settings
+
+
+
-
@@ -764,8 +795,8 @@ Mode 4:
- -
-
+
-
+
0
@@ -773,7 +804,7 @@ Mode 4:
- Startup Settings
+ Automatic Backup Folder
@@ -797,29 +828,6 @@ Mode 4:
- -
-
-
- Show splash screen when Companion starts
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Automatic Backup Folder
-
-
-
-
@@ -833,6 +841,43 @@ Mode 4:
+ -
+
+
+ Show splash screen when Companion starts
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Select Folder
+
+
+
+
+
-
-
@@ -864,32 +909,18 @@ Mode 4:
- -
-
-
-
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Select Folder
-
-
-
-
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Debug Output Logging
+
+
-
@@ -901,7 +932,7 @@ Mode 4:
- -
+
-
@@ -914,16 +945,23 @@ Mode 4:
- -
-
+
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
-
+
0
0
- Debug Output Logging
+ Enable automatic backup before writing firmware
@@ -961,26 +999,6 @@ Mode 4:
- -
-
-
-
- 0
- 0
-
-
-
- Enable automatic backup before writing firmware
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
-
@@ -1008,6 +1026,27 @@ Mode 4:
+ -
+
+
-
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+ Select Folder
+
+
+
+
+
-
-
@@ -1032,47 +1071,13 @@ Mode 4:
- -
-
-
-
-
-
- true
-
-
- false
-
-
-
- -
-
-
- Select Folder
-
-
-
-
-
- -
+
-
Qt::Horizontal
- -
-
-
-
- 0
- 0
-
-
-
- User Splash Screens
-
-
-
-
@@ -1099,29 +1104,18 @@ Mode 4:
- -
-
-
-
-
-
- <html><head/><body><p>Keep a log of all debugging messages generated by the desktop Companion/Simulator applications. An OpenTX developer may request this to help diagnose an issue.</p></body></html>
-
-
- Application (Companion/Simulator)
-
-
-
- -
-
-
- <html><head/><body><p>Keep a log of all messages generated by the radio firmware when running in Simulator. This is the same information one would also see in the Simulator <span style=" font-style:italic;">Debug Output</span> window.</p></body></html>
-
-
- Radio Firmware (in Simulator)
-
-
-
-
+ -
+
+
+
+ 0
+ 0
+
+
+
+ User Splash Screens
+
+
-
@@ -1155,6 +1149,33 @@ Mode 4:
+ -
+
+
-
+
+
+ <html><head/><body><p>Keep a log of all debugging messages generated by the desktop Companion/Simulator applications. An OpenTX developer may request this to help diagnose an issue.</p></body></html>
+
+
+ Application (Companion/Simulator)
+
+
+
+ -
+
+
+ <html><head/><body><p>Keep a log of all messages generated by the radio firmware when running in Simulator. This is the same information one would also see in the Simulator <span style=" font-style:italic;">Debug Output</span> window.</p></body></html>
+
+
+ Radio Firmware (in Simulator)
+
+
+
+
+
+ -
+
+
-
@@ -1357,7 +1378,7 @@ Mode 4:
- Remember simulator switch values
+ Save switch/pot positions on simulator exit
diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp
index 7a457c228..d20e34cc7 100644
--- a/companion/src/simulation/simulatorwidget.cpp
+++ b/companion/src/simulation/simulatorwidget.cpp
@@ -680,14 +680,12 @@ void SimulatorWidget::setupJoysticks()
void SimulatorWidget::restoreRadioWidgetsState()
{
// All RadioWidgets
- if (g.simuSW()) {
- RadioWidget::RadioWidgetState state;
- QList states = g.profile[radioProfileId].simulatorOptions().controlsState;
- foreach (QByteArray ba, states) {
- QDataStream stream(ba);
- stream >> state;
- emit widgetStateChange(state);
- }
+ RadioWidget::RadioWidgetState state;
+ QList 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
@@ -701,8 +699,8 @@ void SimulatorWidget::restoreRadioWidgetsState()
void SimulatorWidget::saveRadioWidgetsState(QList & state)
{
if (m_radioWidgets.size()) {
- state.clear();
if (g.simuSW()) {
+ state.clear();
foreach (RadioWidget * rw, m_radioWidgets)
state.append(rw->getStateData());
}