start with preferences if no id provided

Author: aliakseis

main.cpp

@@ -3,9 +3,13 @@
 #include <QApplication>
 #include <QFile>
 #include <QStyleFactory>
+#include <QSettings>
 
 #include <gst/gst.h>
 
+#include "preferences.h"
+#include "globals.h"
+
 int main(int argc, char *argv[])
 {
     gst_init( &argc, &argv );
@@ -24,6 +28,14 @@ int main(int argc, char *argv[])
         a.setStyleSheet(css_data.readAll());
         css_data.close();
     }
+
+    if (QSettings().value(SETTING_SESSION_ID).toString().trimmed().isEmpty())
+    {
+        Preferences prefDlg(nullptr);
+        if (prefDlg.exec() != QDialog::Accepted)
+            return 1;
+    }
+
     MainWindow w;
     w.show();
     return QApplication::exec();

signaling_connection.cpp

@@ -41,7 +41,7 @@ class NtfySignalingConnection : public ISignalingConnection
         const auto message = this_guid.str() + '\n' + text;
 
         char buffer[1024];
-        sprintf(buffer, send_message_url, QSettings().value(SETTING_SESSION_ID).toString().toStdString().c_str());
+        sprintf(buffer, send_message_url, QSettings().value(SETTING_SESSION_ID).toString().trimmed().toStdString().c_str());
         http(HTTP_POST, buffer, nullptr, message.c_str(), message.length());
     }
 
@@ -163,7 +163,7 @@ class NtfySignalingConnection : public ISignalingConnection
                 };
 
                 char buffer[1024];
-                sprintf(buffer, recv_message_url, QSettings().value(SETTING_SESSION_ID).toString().toStdString().c_str());
+                sprintf(buffer, recv_message_url, QSettings().value(SETTING_SESSION_ID).toString().trimmed().toStdString().c_str());
                 http(HTTP_GET, buffer, headers, nullptr, 0, on_data, verify_sse_response, progress_callback);
         };