Ignore X errors when applying xrandr configuration (fixes CSD crashes…

… with NVIDIA cards linuxmint/cinnamon-settings-daemon#52) Ignore X errors when performing BG crossfade (should make it more stable and we might use it again in 2.8 as a result)
linuxmint · Jun 22, 2015 · dab0d63 · dab0d63
1 parent 15af3e9
commit dab0d63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/libcinnamon-desktop/gnome-bg-crossfade.c b/libcinnamon-desktop/gnome-bg-crossfade.c
@@ -388,6 +388,7 @@ static void
 draw_background (GnomeBGCrossfade *fade)
 {
 	if (gdk_window_get_window_type (fade->priv->window) == GDK_WINDOW_ROOT) {
+		gdk_error_trap_push ();
                 XClearArea (GDK_WINDOW_XDISPLAY (fade->priv->window),
                             GDK_WINDOW_XID (fade->priv->window),
                             0, 0,
@@ -398,6 +399,7 @@ draw_background (GnomeBGCrossfade *fade)
                 send_root_property_change_notification (fade);
 
 		gdk_flush ();
+		gdk_error_trap_pop (); // ignore errors
 	} else {
 		gdk_window_invalidate_rect (fade->priv->window, NULL, FALSE);
 		gdk_window_process_updates (fade->priv->window, FALSE);

diff --git a/libcinnamon-desktop/gnome-rr-config.c b/libcinnamon-desktop/gnome-rr-config.c
@@ -1298,6 +1298,8 @@ gnome_rr_config_apply_with_time (GnomeRRConfig *config,
     g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), FALSE);
     g_return_val_if_fail (GNOME_IS_RR_SCREEN (screen), FALSE);
 
+    gdk_error_trap_push ();
+
     outputs = make_outputs (config);
 
     assignment = crtc_assignment_new (screen, outputs, error);
@@ -1313,7 +1315,9 @@ gnome_rr_config_apply_with_time (GnomeRRConfig *config,
 
 	crtc_assignment_free (assignment);
 
+
 	gdk_flush ();
+	gdk_error_trap_pop (); // ignore errors
     }
 
     return result;