From f0791a52155dfe9bce2c3ba55959551d100efe68 Mon Sep 17 00:00:00 2001 From: RblSb Date: Tue, 31 Mar 2020 18:10:44 +0300 Subject: Some improvements --- src/server/Main.hx | 6 +++++- src/server/VideoTimer.hx | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/server') 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 { -- cgit v1.2.3