diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/Main.hx | 4 | ||||
| -rw-r--r-- | src/server/Main.hx | 6 | ||||
| -rw-r--r-- | src/server/VideoTimer.hx | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/client/Main.hx b/src/client/Main.hx index b0b295e..5644fdd 100644 --- a/src/client/Main.hx +++ b/src/client/Main.hx @@ -477,8 +477,8 @@ class Main { for (emote in config.emotes) { final tag = emote.image.endsWith("mp4") ? 'video autoplay="" loop=""' : "img"; filters.push({ - regex: new EReg("(^| )" + escapeRegExp(emote.name) + "($| )", "g"), - replace: '$1<$tag class="channel-emote" src="${emote.image}" title="${emote.name}"/>$2' + regex: new EReg("(^| )" + escapeRegExp(emote.name) + "(?!\\S)", "g"), + replace: '$1<$tag class="channel-emote" src="${emote.image}" title="${emote.name}"/>' }); } final smilesWrap = ge("#smileswrap"); 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 { |