Fix crash on macOS Catalina

assets/Resources.qrc

@@ -137,11 +137,10 @@
         <file>qml/main.qml</file>
         <file>themes/1_FlatDark.json</file>
         <file>themes/2_FlatLight.json</file>
-        <file>themes/3_Ivrea.json</file>
+        <file>themes/3_Midnight.json</file>
-        <file>themes/4_Midnight.json</file>
+        <file>themes/4_Classic.json</file>
-        <file>themes/5_Classic.json</file>
+        <file>themes/5_Noir.json</file>
-        <file>themes/6_Noir.json</file>
+        <file>themes/6_MathWorks.json</file>
-        <file>themes/7_MathWorks.json</file>
         <file>touchbar/console.png</file>
         <file>touchbar/dashboard.png</file>
         <file>touchbar/setup.png</file>

assets/themes/3_Ivrea.json

@@ -1,66 +0,0 @@
-{
-   "name":"Ivrea",
-   "author":"Alex Spataru",
-   "titlebarSeparator":false,
-   "colors":{
-      "base":"#eaeaea",
-      "link":"#02afed",
-      "button":"#eaeaea",
-      "window":"#eaeaea",
-      "text":"#000000",
-      "midlight":"#eaeaea",
-      "highlight":"#dc7032",
-      "brightText":"#ffffff",
-      "buttonText":"#000000",
-      "windowText":"#000000",
-      "toolTipBase":"#feffc6",
-      "toolTipText":"#000000",
-      "highlightedText":"#ffffff",
-      "highlightedTextAlternative":"#666666",
-      "placeholderText":"#666666",
-      "toolbarGradient1":"#005c5f",
-      "toolbarGradient2":"#005c5f",
-      "menubarText":"#ffffff",
-      "dialogBackground":"#f2f2f2",
-      "consoleText":"#424242",
-      "consoleBase":"#f2f2f2",
-      "consoleButton":"#fafafa",
-      "consoleWindow":"#eaeaea",
-      "consoleHighlight":"#4287ba",
-      "consoleHighlightedText":"#ffffff",
-      "consolePlaceholderText":"#bebebe",
-      "windowBackground":"#e0e0e0",
-      "windowGradient1":"#005c5f",
-      "windowGradient2":"#005c5f",
-      "alternativeHighlight":"#42b554",
-      "setupPanelBackground":"#f2f2f2",
-      "paneWindowBackground":"#eaeaea",
-      "ledEnabled":"#26cd40",
-      "ledDisabled":"#686868",
-      "csvCheckbox":"#2e895c",
-      "connectButtonChecked":"#fc5142",
-      "connectButtonUnchecked":"#2eed5c",
-      "mqttButton":"#4188be",
-      "widgetTextPrimary":"#24476a",
-      "widgetTextSecondary":"#666666",
-      "widgetWindowBackground":"#f2f2f2",
-      "widgetWindowBorder":"#005c5f",
-      "widgetForegroundPrimary":"#f94144",
-      "widgetForegroundSecondary":"#666666",
-      "widgetIndicator":"#444444",
-      "widgetControlBackground":"#666666",
-      "widgetColors":[
-         "#1f76b4",
-         "#ff7f0f",
-         "#2aa02b",
-         "#d62628",
-         "#9467bd",
-         "#8c564c",
-         "#e377c1",
-         "#7f7f7f",
-         "#bcbd21",
-         "#19bdcf",
-         "#1955fe"
-      ]
-   }
-}

src/JSON/Editor.cpp

@@ -674,6 +674,7 @@ QString JSON::Editor::datasetWidgetAlarm(const int group, const int dataset) con
 void JSON::Editor::newJsonFile()
 {
     // Clear groups list
+    qDeleteAll(m_groups);
     m_groups.clear();
 
     // Reset project properties
@@ -936,8 +937,10 @@ bool JSON::Editor::setGroupWidget(const int group, const int widgetId)
                     QMessageBox::Yes | QMessageBox::No);
                 if (ret == QMessageBox::No)
                     return false;
-                else
+                else {
+                    qDeleteAll(grp->m_datasets);
                     grp->m_datasets.clear();
+                }
             }
         }
 

src/MQTT/Client.cpp

@@ -36,8 +36,8 @@ MQTT::Client::Client()
     : m_topic("")
     , m_lookupActive(false)
     , m_sentMessages(0)
-    , m_client(Q_NULLPTR)
     , m_clientMode(MQTTClientMode::ClientPublisher)
+    , m_client(Q_NULLPTR)
 {
     // Configure new client
     regenerateClient();
@@ -55,7 +55,6 @@ MQTT::Client::Client()
  */
 MQTT::Client::~Client()
 {
-    disconnectFromHost();
     delete m_client;
 }
 
@@ -225,8 +224,8 @@ StringList MQTT::Client::qosLevels() const
     // clang-format off
     return StringList {
         tr("0: At most once"),
-                tr("1: At least once"),
+        tr("1: At least once"),
-                tr("2: Exactly once")
+        tr("2: Exactly once")
     };
     // clang-format on
 }

src/MQTT/Client.h

@@ -232,9 +232,9 @@ private:
     bool m_lookupActive;
     QString m_caFilePath;
     quint16 m_sentMessages;
-    QMQTT::Client *m_client;
-    QVector<QByteArray> m_frames;
     MQTTClientMode m_clientMode;
+    QVector<QByteArray> m_frames;
+    QPointer<QMQTT::Client> m_client;
     QSslConfiguration m_sslConfiguration;
 };
 }