# HG changeset patch # User Matti Hamalainen # Date 1212012193 -10800 # Node ID bc29f566be02f98f3b70c1bb1f578e0c1fe11897 # Parent bc30700268d31d6d650b2758085b9fcddff97e30 Handle properly the situation when player is not running and files are added from commandline. diff -r bc30700268d3 -r bc29f566be02 src/audacious/main.c --- a/src/audacious/main.c Thu May 29 01:01:44 2008 +0300 +++ b/src/audacious/main.c Thu May 29 01:03:13 2008 +0300 @@ -315,7 +315,7 @@ } static void -handle_cmd_line_options() +handle_cmd_line_options(gboolean skip) { gchar **filenames = options.filenames; #ifdef USE_DBUS @@ -430,7 +430,7 @@ } /* is_running */ else #endif - { /* !is_running */ + if (!skip) { /* !is_running */ if (filenames != NULL) { gint pos = 0; @@ -715,7 +715,7 @@ signal_handlers_init(); - handle_cmd_line_options(); + handle_cmd_line_options(TRUE); if (options.headless == FALSE) { @@ -735,6 +735,8 @@ plugin_system_init(); playlist_system_init(); + handle_cmd_line_options(FALSE); + #ifdef USE_DBUS init_dbus(); #endif