1 files changed, 9 insertions, 0 deletions
diff --git a/src/kitplayer.c b/src/kitplayer.c
index 2d19c80..fc6a2ca 100644
--- a/src/kitplayer.c
+++ b/src/kitplayer.c
@@ -176,6 +176,15 @@ static int reset_libass_track(Kit_Player *player) {
     Kit_LibraryState *state = Kit_GetLibraryState();
     AVCodecContext *scodec_ctx = player->scodec_ctx;
 
+    if(scodec_ctx == NULL) {
+        return 0;
+    }
+
+    // Free old track
+    if(player->ass_track) {
+        ass_free_track(player->ass_track);
+    }
+
     // Initialize libass track
     player->ass_track = ass_new_track(state->libass_handle);
     if(player->ass_track == NULL) {