File gnome-shell-917489-only-set-scaling-factor-if-p... of Package gnome-shell.1083

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-shell-917489-only-set-scaling-factor-if-present.patch of Package gnome-shell.1083

From 29addc499ca0f8dc5bf9cf6d18eaaa01a5c2b985 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 22 Feb 2014 18:00:57 -0500
Subject: shell-global: Only set the scale factor if get_setting succeeded

If gdk_screen_get_setting fails, like if it's running without XSettings,
then the GValue will have a value of 0. A lot of code tries to divide by
the scale factor. This produces NaN, and combined with the fact that NaN
is "leaky", we very quickly end up spinning out of control.

diff --git a/src/shell-global.c b/src/shell-global.c
index 7e0ac8b..59b5273 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -756,8 +756,8 @@ update_scale_factor (GdkScreen *screen, gpointer data)
   GValue value = G_VALUE_INIT;
 
   g_value_init (&value, G_TYPE_INT);
-  gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value);
-  g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
+  if (gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value))
+    g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
 }
 
 /* This is an IBus workaround. The flow of events with IBus is that every time
-- 
cgit v0.10.2

Places

File gnome-shell-917489-only-set-scaling-factor-if-present.patch of Package gnome-shell.1083

Places