Mercurial > audlegacy
changeset 4357:e22a8deaf7b5
more headless fixes
| author | mf0102 <0102@gmx.at> |
|---|---|
| date | Mon, 17 Mar 2008 19:35:44 +0100 |
| parents | 87cb9d3402d4 |
| children | 6478692415a0 |
| files | src/audacious/main.c |
| diffstat | 1 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/main.c Mon Mar 17 18:53:45 2008 +0100 +++ b/src/audacious/main.c Mon Mar 17 19:35:44 2008 +0100 @@ -736,6 +736,11 @@ playlist_load(playlist, bmp_paths[BMP_PATH_PLAYLIST_FILE]); playlist_set_position(playlist, cfg.playlist_position); + /* Load extra playlists */ + if (!dir_foreach(bmp_paths[BMP_PATH_PLAYLISTS_DIR], load_extra_playlist, + playlist, NULL)) + g_warning("Could not load extra playlists\n"); + handle_cmd_line_options(); #ifdef USE_DBUS @@ -757,22 +762,13 @@ } GDK_THREADS_ENTER(); - } - - /* Load extra playlists */ - if(!dir_foreach(bmp_paths[BMP_PATH_PLAYLISTS_DIR], load_extra_playlist, - playlist, NULL)) { - g_warning("Could not load extra playlists\n"); - } - /* this needs to be called after all 3 windows are created and - * input plugins are setup'ed - * but not if we're running headless --nenolod - */ - mainwin_setup_menus(); + /* this needs to be called after all 3 windows are created and + * input plugins are setup'ed + * but not if we're running headless --nenolod + */ + mainwin_setup_menus(); - if (options.headless == FALSE) - { ui_main_set_initial_volume(); /* FIXME: delayed, because it deals directly with the plugin