Some improvements

2 files changed, 8 insertions, 4 deletions

diff --git a/src/server/Main.hx b/src/server/Main.hx
index bf334a6..696651c 100644
--- a/src/server/Main.hx
+++ b/src/server/Main.hx
@@ -93,7 +93,11 @@ class Main {
 
 	public function exit():Void {
 		saveState();
-		process.exit();
+		if (wss == null) {
+			process.exit();
+			return;
+		}
+		wss.close(() -> process.exit());
 	}
 
 	function generateConfigSalt():String {
diff --git a/src/server/VideoTimer.hx b/src/server/VideoTimer.hx
index 695ea5d..7ac51d9 100644
--- a/src/server/VideoTimer.hx
+++ b/src/server/VideoTimer.hx
@@ -18,8 +18,8 @@ class VideoTimer {
 
 	public function stop():Void {
 		isStarted = false;
-		startTime = 0.0;
-		pauseStartTime = 0.0;
+		startTime = 0;
+		pauseStartTime = 0;
 	}
 
 	public function pause():Void {
@@ -43,7 +43,7 @@ class VideoTimer {
 	}
 
 	public function isPaused():Bool {
-		return pauseStartTime != 0;
+		return !isStarted || pauseStartTime != 0;
 	}
 
 	function pauseTime():Float {