* async_queue.*: AsyncQueue::remove is now thread-safe to avoid potential

[vlc] / modules / gui / skins2 / commands / cmd_input.cpp

diff --git a/modules/gui/skins2/commands/cmd_input.cpp b/modules/gui/skins2/commands/cmd_input.cpp
index a64fba179714994927212181cfe166dc7b5cf1b6..7ea664c58499e757ce00bf9258fc932dd0c56abb 100644 (file)
--- a/modules/gui/skins2/commands/cmd_input.cpp
+++ b/modules/gui/skins2/commands/cmd_input.cpp
@@ -24,6 +24,7 @@
 
 #include <vlc/aout.h>
 #include "cmd_input.hpp"
+#include "cmd_dialogs.hpp"
 
 
 void CmdPlay::execute()
@@ -34,7 +35,16 @@ void CmdPlay::execute()
         return;
     }
 
-    playlist_Play( pPlaylist );
+    if( pPlaylist->i_size )
+    {
+        playlist_Play( pPlaylist );
+    }
+    else
+    {
+        // If the playlist is empty, open a file requester instead
+        CmdDlgFile cmd( getIntf() );
+        cmd.execute();
+    }
 }