From 9bbc50ff3cde0661a427c8e3d8c330860dabee40 Mon Sep 17 00:00:00 2001
From: AlexandreRouma <alexandre.rouma@gmail.com>
Date: Thu, 24 Feb 2022 21:01:51 +0100
Subject: [PATCH] Fixed issues hopefully

---
 core/backends/android/backend.cpp               | 2 +-
 core/src/core.cpp                               | 4 ++--
 core/src/gui/widgets/file_select.cpp            | 2 +-
 core/src/gui/widgets/folder_select.cpp          | 2 +-
 core/src/server.cpp                             | 4 ++--
 decoder_modules/meteor_demodulator/src/main.cpp | 2 +-
 misc_modules/recorder/src/main.cpp              | 4 ++--
 source_modules/rtl_sdr_source/src/main.cpp      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/backends/android/backend.cpp b/core/backends/android/backend.cpp
index 8552774..93c5f31 100644
--- a/core/backends/android/backend.cpp
+++ b/core/backends/android/backend.cpp
@@ -35,7 +35,7 @@ namespace backend {
     int PollUnicodeChars();
 
     void doPartialInit() {
-        std::string root = core::args["root"];
+        std::string root = (std::string)core::args["root"];
         backend::init();
         style::loadFonts(root + "/res"); // TODO: Don't hardcode, use config
         icons::load(root + "/res");
diff --git a/core/src/core.cpp b/core/src/core.cpp
index fc08293..8999874 100644
--- a/core/src/core.cpp
+++ b/core/src/core.cpp
@@ -74,14 +74,14 @@ int sdrpp_main(int argc, char* argv[]) {
         return 0;
     }
 
-    bool serverMode = core::args["server"];
+    bool serverMode = (bool)core::args["server"];
 
 #ifdef _WIN32
     if (!core::args["con"].b() && !serverMode) { FreeConsole(); }
 #endif
 
     // Check root directory
-    std::string root = core::args["root"];
+    std::string root = (std::string)core::args["root"];
     if (!std::filesystem::exists(root)) {
         spdlog::warn("Root directory {0} does not exist, creating it", root);
         if (!std::filesystem::create_directories(root)) {
diff --git a/core/src/gui/widgets/file_select.cpp b/core/src/gui/widgets/file_select.cpp
index dea857d..a4fe54e 100644
--- a/core/src/gui/widgets/file_select.cpp
+++ b/core/src/gui/widgets/file_select.cpp
@@ -6,7 +6,7 @@
 
 FileSelect::FileSelect(std::string defaultPath, std::vector<std::string> filter) {
     _filter = filter;
-    root = core::args["root"];
+    root = (std::string)core::args["root"];
     setPath(defaultPath);
 }
 
diff --git a/core/src/gui/widgets/folder_select.cpp b/core/src/gui/widgets/folder_select.cpp
index b2f7029..a6c361c 100644
--- a/core/src/gui/widgets/folder_select.cpp
+++ b/core/src/gui/widgets/folder_select.cpp
@@ -5,7 +5,7 @@
 #include <core.h>
 
 FolderSelect::FolderSelect(std::string defaultPath) {
-    root = core::args["root"];
+    root = (std::string)core::args["root"];
     setPath(defaultPath);
 }
 
diff --git a/core/src/server.cpp b/core/src/server.cpp
index 367ea27..8ad9fb7 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -148,8 +148,8 @@ namespace server {
         sigpath::sourceManager.selectSource(sourceList[sourceId]);
 
         // TODO: Use command line option
-        std::string host = core::args["addr"];
-        int port = core::args["port"];
+        std::string host = (std::string)core::args["addr"];
+        int port = (int)core::args["port"];
         listener = net::listen(host, port);
         listener->acceptAsync(_clientHandler, NULL);
 
diff --git a/decoder_modules/meteor_demodulator/src/main.cpp b/decoder_modules/meteor_demodulator/src/main.cpp
index 016a2ef..35c4777 100644
--- a/decoder_modules/meteor_demodulator/src/main.cpp
+++ b/decoder_modules/meteor_demodulator/src/main.cpp
@@ -243,7 +243,7 @@ private:
 
 MOD_EXPORT void _INIT_() {
     // Create default recording directory
-    std::string root = core::args["root"];
+    std::string root = (std::string)core::args["root"];
     if (!std::filesystem::exists(root + "/recordings")) {
         spdlog::warn("Recordings directory does not exist, creating it");
         if (!std::filesystem::create_directory(root + "/recordings")) {
diff --git a/misc_modules/recorder/src/main.cpp b/misc_modules/recorder/src/main.cpp
index a68f28b..f196d80 100644
--- a/misc_modules/recorder/src/main.cpp
+++ b/misc_modules/recorder/src/main.cpp
@@ -46,7 +46,7 @@ public:
     RecorderModule(std::string name) : folderSelect("%ROOT%/recordings") {
         this->name = name;
 
-        root = core::args["root"];
+        root = (std::string)core::args["root"];
 
         // Load config
         config.acquire();
@@ -518,7 +518,7 @@ struct RecorderContext_t {
 
 MOD_EXPORT void _INIT_() {
     // Create default recording directory
-    std::string root = core::args["root"];
+    std::string root = (std::string)core::args["root"];
     if (!std::filesystem::exists(root + "/recordings")) {
         spdlog::warn("Recordings directory does not exist, creating it");
         if (!std::filesystem::create_directory(root + "/recordings")) {
diff --git a/source_modules/rtl_sdr_source/src/main.cpp b/source_modules/rtl_sdr_source/src/main.cpp
index baa6a84..601cef5 100644
--- a/source_modules/rtl_sdr_source/src/main.cpp
+++ b/source_modules/rtl_sdr_source/src/main.cpp
@@ -59,7 +59,7 @@ public:
     RTLSDRSourceModule(std::string name) {
         this->name = name;
 
-        serverMode = core::args["server"];
+        serverMode = (bool)core::args["server"];
 
         sampleRate = sampleRates[0];