[Simulator] Fix startup when using a new file for radio data (file is now properly created, errors from Storage are ignored); Do not start simulator at all in case of data errors; Fix startup option dialog when finding radio type from profile for first time; Fix RadioOptions struct version control; Cleanup unused WinConsole code; Fix a warning and a missing const reference; Move ~SimulatedUIWidget() to public.

2017-01-28 19:15:46 -05:00
parent 32dc0dd2a0
commit fae095ea18
9 changed files with 54 additions and 52 deletions
@@ -45,7 +45,7 @@ struct SimulatorOptions
    };

  private:
-    quint16 _version = SIMULATOR_OPTIONS_VERSION;  // structure definition version
+    quint16 _version;  // structure definition version

  public:
    // v1 fields
@@ -60,7 +60,7 @@ struct SimulatorOptions

    friend QDataStream & operator << (QDataStream &out, const SimulatorOptions & o)
    {
-      out << o._version << o.startupDataType << o.firmwareId << o.dataFile << o.dataFolder
+      out << quint16(SIMULATOR_OPTIONS_VERSION) << o.startupDataType << o.firmwareId << o.dataFile << o.dataFolder
          << o.sdPath << o.windowGeometry << o.controlsState << o.lcdColor;
      return out;
    }