2 files changed, 6 insertions, 3 deletions

diff --git a/apps/plugins/mpegplayer/mpeg_parser.c b/apps/plugins/mpegplayer/mpeg_parser.c
index 5821bd57ab..1be11a467b 100644
--- a/apps/plugins/mpegplayer/mpeg_parser.c
+++ b/apps/plugins/mpegplayer/mpeg_parser.c
@@ -1144,6 +1144,7 @@ int parser_init_stream(void)
     if (!init_video_info())
     {
         /* Cannot determine video size, etc. */
+        parser_init_state();
         return STREAM_UNSUPPORTED;
     }
 
@@ -1157,6 +1158,7 @@ int parser_init_stream(void)
         if (video_str.start_pts == INVALID_TIMESTAMP)
         {
             /* Must have video at least */
+            parser_init_state();
             return STREAM_UNSUPPORTED;
         }
 
diff --git a/apps/plugins/mpegplayer/stream_mgr.c b/apps/plugins/mpegplayer/stream_mgr.c
index 2eed3d355d..b88c6d70c7 100644
--- a/apps/plugins/mpegplayer/stream_mgr.c
+++ b/apps/plugins/mpegplayer/stream_mgr.c
@@ -592,7 +592,7 @@ static int stream_on_close(void)
 
     stream_mgr_lock();
 
-    /* Any open file? */
+    /* Any open file that was accepted for playback? */
     if (stream_mgr.filename != NULL)
     {
         /* Yes - hide video */
@@ -602,12 +602,13 @@ static int stream_on_close(void)
         stream_on_stop(false);
         /* Tell parser file is finished */
         parser_close_stream();
-        /* Close file */
-        disk_buf_close();
         /* Reinitialize manager */
         stream_mgr_init_state();
     }
 
+    /* Let disk buffer reset itself - file might be open even if no good */
+    disk_buf_close();
+
     stream_mgr_unlock();
 
     return status;