Don't preparse folders using input_Preprase

[vlc] / modules / gui / wxwidgets / dialogs.cpp

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index e765dd9838dbc87465447af67469d9e2ed8985da..066a822f2d5f99d5e4b304205fbfc059fa6b8613 100644 (file)
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -272,7 +272,7 @@ void DialogsProvider::OnIdle( wxIdleEvent& WXUNUSED(event) )
 
     /* Update the fileinfo windows */
     if( p_fileinfo_dialog )
-        p_fileinfo_dialog->UpdateFileInfo();
+        p_fileinfo_dialog->Update();
 }
 
 void DialogsProvider::OnPlaylist( wxCommandEvent& WXUNUSED(event) )
@@ -430,11 +430,12 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
             char *psz_utf8 = wxFromLocale( paths[i] );
             if( event.GetInt() )
                 playlist_Add( p_playlist, psz_utf8, psz_utf8,
-                              PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO),
+                              PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
+                              (i ? PLAYLIST_PREPARSE : 0 ),
                               PLAYLIST_END );
             else
                 playlist_Add( p_playlist, psz_utf8, psz_utf8,
-                              PLAYLIST_APPEND, PLAYLIST_END );
+                              PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END );
             wxLocaleFree( psz_utf8 );
         }
     }
@@ -549,7 +550,6 @@ void DialogsProvider::OnInteraction( wxCommandEvent& event )
     }
     p_dialog = p_arg->p_dialog;
 
-
     /** \bug We store the interface object for the dialog in the p_private
      * field of the core dialog object. This is not safe if we change
      * interface while a dialog is loaded */
@@ -563,11 +563,19 @@ void DialogsProvider::OnInteraction( wxCommandEvent& event )
         break;
     case INTERACT_UPDATE:
         p_wxdialog = (InteractionDialog*)(p_dialog->p_private);
-        p_wxdialog->Update();
+        if( p_wxdialog)
+            p_wxdialog->Update();
         break;
     case INTERACT_HIDE:
         p_wxdialog = (InteractionDialog*)(p_dialog->p_private);
-        p_wxdialog->Hide();
+        if( p_wxdialog )
+            p_wxdialog->Hide();
+        p_dialog->i_status = HIDDEN_DIALOG;
+        break;
+    case INTERACT_DESTROY:
+        p_wxdialog = (InteractionDialog*)(p_dialog->p_private);
+        /// \todo
+        p_dialog->i_status = DESTROYED_DIALOG;
         break;
     }
 }