From 30962d60b9a058e415098130e098430cf70b63f7 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 2 Jan 2019 19:02:34 +0100
Subject: [PATCH] Properly handle options if core has just now been configured

---
 src/core/core.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 51a6f0c4..5d49ee21 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -189,7 +189,9 @@ void Core::init()
             quInfo() << "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};
-- 
2.20.1