Merge pull request #81 from peerless2012/fix/glprogram-uninitialized-crash

peerless2012 · web-flow · commit fd7db48a073b · 2026-06-04T17:49:00.000+08:00
fix: check glProgram initialization before delete in onSurfaceDestroyed
diff --git a/lib_ass_media/src/main/java/io/github/peerless2012/ass/media/widget/AssSubtitleTextureView.kt b/lib_ass_media/src/main/java/io/github/peerless2012/ass/media/widget/AssSubtitleTextureView.kt
@@ -365,7 +365,9 @@ class AssSubtitleTextureView : TextureView, AssSubtitleRender, TextureView.Surfa
         override fun onSurfaceDestroyed() {
             GlUtil.deleteBuffer(vertexBufferId)
             GlUtil.deleteBuffer(texCoordBufferId)
-            glProgram.delete()
+            if (::glProgram.isInitialized) {
+                glProgram.delete()
+            }
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,9 @@ class AssSubtitleTextureView : TextureView, AssSubtitleRender, TextureView.Surfa`
`365`	`365`	`override fun onSurfaceDestroyed() {`
`366`	`366`	`GlUtil.deleteBuffer(vertexBufferId)`
`367`	`367`	`GlUtil.deleteBuffer(texCoordBufferId)`
`368`		`- glProgram.delete()`
	`368`	`+ if (::glProgram.isInitialized) {`
	`369`	`+ glProgram.delete()`
	`370`	`+ }`
`369`	`371`	`}`
`370`	`372`
`371`	`373`	`}`