gnome-settings-daemon r672 - in trunk: . plugins/xrandr

[jensg svn gnome org]

Author: jensg
Date: Sat Jan 24 11:40:09 2009
New Revision: 672
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=672&view=rev

Log:
2009-01-24  Jens Granseuer  <jensgr gmx net>

	Patch by: Andres Freund <andres anarazel de>

	Fix possible crash when pressing Fn-F7 (bug #568713)

	* plugins/xrandr/gsd-xrandr-manager.c: (handle_fn_f7): only try to
	dereference the error when it was actually set


Modified:
   trunk/ChangeLog
   trunk/plugins/xrandr/gsd-xrandr-manager.c

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Sat Jan 24 11:40:09 2009
@@ -526,7 +526,7 @@
         g_debug ("Handling fn-f7");
 
         error = NULL;
-        if (!gnome_rr_screen_refresh (screen, &error)) {
+        if (!gnome_rr_screen_refresh (screen, &error) && error) {
                 char *str;
 
                 str = g_strdup_printf (_("Could not refresh the screen information: %s"), error->message);