--- ./src/audacious/main.c.orig	2008-05-23 17:00:34.000000000 -0500
+++ ./src/audacious/main.c	2009-04-10 17:03:00.000000000 -0500
@@ -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