From 0e63392ee31264b42c03925533d575ee58bfaba4 Mon Sep 17 00:00:00 2001
From: Dmitri Bogomolov <4glitch@gmail.com>
Date: Sun, 4 Nov 2018 15:00:27 +0200
Subject: [PATCH] Fix #1385: not check for pyqt if daemon = true set in config

---
 src/bitmessagemain.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index 4eefceb0..2c3d10db 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -181,7 +181,6 @@ class Main:
                 sys.exit()
             elif opt in ("-d", "--daemon"):
                 daemon = True
-                state.enableGUI = False  # run without a UI
             elif opt in ("-c", "--curses"):
                 state.curses = True
             elif opt in ("-t", "--test"):
@@ -205,7 +204,9 @@ class Main:
                     os.path.join(app_dir, 'tests', 'apinotify_handler.py')
                 )
 
-        # is the application already running?  If yes then exit.
+        if daemon:
+            state.enableGUI = False  # run without a UI
+
         if state.enableGUI and not state.curses and not depends.check_pyqt():
             sys.exit(
                 'PyBitmessage requires PyQt unless you want'
@@ -219,6 +220,7 @@ class Main:
                 ' the new curses interface by providing'
                 ' \'-c\' as a commandline argument.'
             )
+        # is the application already running?  If yes then exit.
         shared.thisapp = singleinstance("", daemon)
 
         if daemon: