Merge pull request #24 from dmitrylyzo/fix-last-event

jellyfin · May 4, 2022 · 5ab8af3 · 5ab8af3
2 parents df0e75f + d479643
commit 5ab8af3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/SubtitleOctopus.cpp b/src/SubtitleOctopus.cpp
@@ -555,7 +555,7 @@ class SubtitleOctopus {
         if (minFinish != -1) {
             // some event is going on, so we need to re-draw either when it stops
             // or when some other event starts
-            result.eventFinish = ((minFinish < minStart) ? minFinish : minStart) / 1000.0;
+            result.eventFinish = ((minStart == -1 || minFinish < minStart) ? minFinish : minStart) / 1000.0;
         } else {
             // there's no current event, so no need to draw anything
             result.eventFinish = -1;

diff --git a/src/subtitles-octopus.js b/src/subtitles-octopus.js
@@ -297,7 +297,7 @@ var SubtitlesOctopus = function (options) {
             }
         }
 
-        var removed = retainedItems.length < self.renderedItems;
+        var removed = retainedItems.length < self.renderedItems.length;
         self.renderedItems = retainedItems;
         return removed;
     }