Merge pull request #4717 from Bnyro/master

fix: crash when scrubbing timebar on certain videos
libre-tube · Sep 8, 2023 · 1d7fce9 · 1d7fce9
2 parents 9c78391 + 50eefcb
commit 1d7fce9
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/app/src/main/java/com/github/libretube/util/OnlineTimeFrameReceiver.kt b/app/src/main/java/com/github/libretube/util/OnlineTimeFrameReceiver.kt
@@ -21,13 +21,12 @@ class OnlineTimeFrameReceiver(
      * Cut off a new bitmap from the image that contains multiple preview thumbnails
      */
     private fun cutBitmapFromPreviewFrame(bitmap: Bitmap, previewFrame: PreviewFrame): Bitmap {
-        return Bitmap.createBitmap(
-            bitmap,
-            previewFrame.positionX * previewFrame.frameWidth,
-            previewFrame.positionY * previewFrame.frameHeight,
-            previewFrame.frameWidth,
-            previewFrame.frameHeight
-        )
+        val positionX = previewFrame.positionX * previewFrame.frameWidth
+        val positionY = previewFrame.positionY * previewFrame.frameHeight
+        val width = minOf(previewFrame.frameWidth, bitmap.width - positionX)
+        val height = minOf(previewFrame.frameHeight, bitmap.height - positionY)
+
+        return Bitmap.createBitmap(bitmap, positionX, positionY, width, height)
     }
 
     /**