changeset 4370:8ca25aee5037

Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 25 Mar 2008 21:02:13 +0200
parents 2fa51f742f25 (current diff) 99b6e2bac92a (diff)
children 20418bdce637
files
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/bmpconfig.c	Tue Mar 25 15:16:46 2008 +0200
+++ b/src/audacious/bmpconfig.c	Tue Mar 25 21:02:13 2008 +0200
@@ -635,7 +635,8 @@
     /* FIXME: we're looking up SkinnedWindow::x &c ourselves here.
      * this isn't exactly right. -nenolod
      */
-    if ( SKINNED_WINDOW(playlistwin)->x != -1 &&
+    if ( playlistwin &&
+         SKINNED_WINDOW(playlistwin)->x != -1 &&
          SKINNED_WINDOW(playlistwin)->y != -1 )
     {
         cfg_db_set_int(db, NULL, "playlist_x",
@@ -644,7 +645,8 @@
                            SKINNED_WINDOW(playlistwin)->y);
     }
     
-    if ( SKINNED_WINDOW(mainwin)->x != -1 &&
+    if ( mainwin &&
+         SKINNED_WINDOW(mainwin)->x != -1 &&
          SKINNED_WINDOW(mainwin)->y != -1 )
     {
         cfg_db_set_int(db, NULL, "player_x",
@@ -653,7 +655,8 @@
                            SKINNED_WINDOW(mainwin)->y);
     }
 
-    if ( SKINNED_WINDOW(equalizerwin)->x != -1 &&
+    if ( equalizerwin &&
+         SKINNED_WINDOW(equalizerwin)->x != -1 &&
          SKINNED_WINDOW(equalizerwin)->y != -1 )
     {
         cfg_db_set_int(db, NULL, "equalizer_x",
--- a/src/audacious/main.c	Tue Mar 25 15:16:46 2008 +0200
+++ b/src/audacious/main.c	Tue Mar 25 21:02:13 2008 +0200
@@ -378,7 +378,6 @@
     g_option_context_add_main_entries(context, cmd_entries, PACKAGE_NAME);
     g_option_context_add_group(context, gtk_get_option_group(FALSE));
     g_option_context_add_group(context, egg_sm_client_get_option_group());
-    g_option_context_parse(context, argc, argv, &error);
     if (!g_option_context_parse(context, argc, argv, &error))
         /* checking for MacOS X -psn_0_* errors*/
         if (error->message && !g_strrstr(error->message,"-psn_0_"))
@@ -837,6 +836,8 @@
     {
         GMainLoop *loop;
 
+        g_print(_("Headless operation enabled\n"));
+
         playlist_start_get_info_thread();
 
         loop = g_main_loop_new(NULL, TRUE);