From eb82282e58259b243958e7590506bd26f8e92db0 Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Sun, 8 Mar 2020 01:27:55 +0100
Subject: [PATCH] Fixed stopping main server from console

---
 maloja/__pkginfo__.py |  2 +-
 maloja/controller.py  | 21 +++++++++++++--------
 maloja/supervisor.py  |  1 -
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py
index cdc8db4..f3709dc 100644
--- a/maloja/__pkginfo__.py
+++ b/maloja/__pkginfo__.py
@@ -5,7 +5,7 @@ author = {
 	"email":"maloja@krateng.dev",
 	"github": "krateng"
 }
-version = 2,3,3
+version = 2,3,4
 versionstr = ".".join(str(n) for n in version)
 links = {
 	"pypi":"malojaserver",
diff --git a/maloja/controller.py b/maloja/controller.py
index 6f1aed4..3d3a0a3 100755
--- a/maloja/controller.py
+++ b/maloja/controller.py
@@ -126,20 +126,25 @@ def stop():
 	pid_sv = getInstanceSupervisor()
 	if pid_sv is not None:
 		os.kill(pid_sv,signal.SIGTERM)
-		return True
+#		return True
 
-	else:
-		print("Server is not running")
-		return False
-
-#	pid = getInstance()
-#	if pid is None:
+#	else:
 #		print("Server is not running")
 #		return False
+
+
+	pid = getInstance()
+	if pid is not None:
+#		print("Server is not running")
+#		return False
+#		pass
 #	else:
-#		os.kill(pid,signal.SIGTERM)
+		os.kill(pid,signal.SIGTERM)
 #		print("Maloja stopped! PID: " + str(pid))
+	if pid is not None or pid_sv is not None:
 		return True
+	else:
+		return False
 
 
 def loadlastfm(filename):
diff --git a/maloja/supervisor.py b/maloja/supervisor.py
index 1982230..2846252 100644
--- a/maloja/supervisor.py
+++ b/maloja/supervisor.py
@@ -31,7 +31,6 @@ def update():
 def start():
 	try:
 		p = subprocess.Popen(["python3","-m","maloja.server"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
-		log(p,module="supervisor")
 
 	except e:
 		log("Error starting Maloja: " + str(e),module="supervisor")