From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 2 Jan 2019 18:35:43 +0000 (+0100)
Subject: Properly handle options if core has just now been configured
X-Git-Tag: test-travis-01~80
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d1ecf9e978968e1ed82f1baee64f83d7f60c7017;hp=dcc39bc640adc4dc1b326162dbe8d682cb035447

Properly handle options if core has just now been configured
---

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 47e04aae..a4133eb1 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -187,7 +187,9 @@ void Core::init()
             qInfo() << "Core is currently not configured! Please connect with a Quassel Client for basic setup.";
         }
     }
-    else {
+
+    // This checks separately because config-from-environment might have only configured the core just now
+    if (_configured) {
         if (Quassel::isOptionSet("add-user")) {
             bool success = createUser();
             throw ExitException{success ? EXIT_SUCCESS : EXIT_FAILURE};