Merge pull request #2787

9deca92 fix multiple minor issues (c-style casts, default branch, etc.) (xiphon)

2 files changed, 6 insertions, 4 deletions

diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index 215cd0a2..74f1077a 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -49,13 +49,15 @@ namespace {
 DaemonManager * DaemonManager::m_instance = nullptr;
 QStringList DaemonManager::m_clArgs;
 
-DaemonManager *DaemonManager::instance(const QStringList *args)
+DaemonManager *DaemonManager::instance(const QStringList *args/* = nullptr*/)
 {
     if (!m_instance) {
         m_instance = new DaemonManager;
         // store command line arguments for later use
-        m_clArgs = *args;
-        m_clArgs.removeFirst();
+        if (args != nullptr)
+        {
+            m_clArgs = *args;
+        }
     }
 
     return m_instance;
diff --git a/src/daemon/DaemonManager.h b/src/daemon/DaemonManager.h
index 774aecb3..e670373c 100644
--- a/src/daemon/DaemonManager.h
+++ b/src/daemon/DaemonManager.h
@@ -42,7 +42,7 @@ class DaemonManager : public QObject
 
 public:
 
-    static DaemonManager * instance(const QStringList *args);
+    static DaemonManager * instance(const QStringList *args = nullptr);
 
     Q_INVOKABLE bool start(const QString &flags, NetworkType::Type nettype, const QString &dataDir = "", const QString &bootstrapNodeAddress = "", bool noSync = false);
     Q_INVOKABLE void stopAsync(NetworkType::Type nettype, const QJSValue& callback);