changeset 2915:8d35fb41459f trunk

Automated merge from ssh://hg.atheme.org//hg/audacious.
author William Pitcock <nenolod@atheme.org>
date Fri, 29 Jun 2007 01:50:38 -0500
parents 22c940e0d2dc (diff) 80c6a8fec3ba (current diff)
children 3ef909ed3056
files
diffstat 1 files changed, 0 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/main.c	Thu Jun 28 20:24:35 2007 +0200
+++ b/src/audacious/main.c	Fri Jun 29 01:50:38 2007 -0500
@@ -1232,14 +1232,7 @@
     mainwin_setup_menus();
 
     if (options.headless != 1)
-        GDK_THREADS_LEAVE();
-
-    handle_cmd_line_options(&options, FALSE);
-
-    if (options.headless != 1)
     {
-        GDK_THREADS_ENTER();
-
         read_volume(VOLSET_STARTUP);
         mainwin_set_info_text();