2 files changed, 4 insertions, 1 deletions
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index b34b3c421..350aae777 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -322,7 +322,7 @@ MpdTag * mp4DataDup(char * file, int * mp4MetadataFound) {
 
 	*mp4MetadataFound = 0;
 	
-	if(openInputStream(file) < 0) return NULL;
+	if(openInputStream(&inStream, file) < 0) return NULL;
 
 	cb = malloc(sizeof(mp4ff_callback_t));
 	cb->read = mp4_inputStreamReadCallback;
diff --git a/src/playlist.c b/src/playlist.c
index 412ddce19..0c499f0ad 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -687,6 +687,9 @@ int playPlaylist(FILE * fp, int song, int stopOnError) {
 	clearPlayerError();
 
 	if(song==-1) {
+                if(playlist_state == PLAYLIST_STATE_PLAY) {
+                        return playerSetPause(fp, 0);
+                }
                 if(playlist.current >= 0 && playlist.current < playlist.length)
                 {
                         i = playlist.current;