From 87bd7acd10cd7e5e3c689d3269f519e8bcb8355c Mon Sep 17 00:00:00 2001 From: Seth Nickell Date: Sat, 28 Dec 2002 21:46:45 +0000 Subject: [PATCH] Fix crash when current WM isn't detected. 2002-12-28 Seth Nickell * gnome-theme-manager.c: (update_themes_from_disk): Fix crash when current WM isn't detected. --- capplets/theme-switcher/ChangeLog | 6 ++++++ capplets/theme-switcher/gnome-theme-manager.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 5bd52d486..a556bf28b 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,9 @@ +2002-12-28 Seth Nickell + + * gnome-theme-manager.c: (update_themes_from_disk): + + Fix crash when current WM isn't detected. + 2002-12-18 Jody Goldberg * Release 2.1.5 diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c index 1fd8ce4ff..d9c7db7f8 100644 --- a/capplets/theme-switcher/gnome-theme-manager.c +++ b/capplets/theme-switcher/gnome-theme-manager.c @@ -413,8 +413,13 @@ update_themes_from_disk (GladeXML *dialog) current_icon_theme = gconf_client_get_string (client, ICON_THEME_KEY, NULL); window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ())); wm_settings.flags = GNOME_WM_SETTING_THEME; - gnome_window_manager_get_settings (window_manager, &wm_settings); - current_window_theme = g_strdup (wm_settings.theme); + + if (window_manager != NULL) { + gnome_window_manager_get_settings (window_manager, &wm_settings); + current_window_theme = g_strdup (wm_settings.theme); + } else { + current_window_theme = NULL; + } /* FIXME: What do we really do when there is no theme? Ask Havoc here. */ /* BROKEN BROKEN BROKEN */