From 678713889797542419989e9cc9153feca7baebc2 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 12 Jul 2014 12:42:06 +0200 Subject: xrandr: Only connect to MateRRScreen's signal after checking it's not NULL Taken from gnome-settings-deaemon commit:9b1fd55f4e65cad07a3f39de441aca53e34e7473 From: Rodrigo Moya --- plugins/xrandr/msd-xrandr-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index d93a045..37ae25f 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -2337,7 +2337,6 @@ msd_xrandr_manager_start (MsdXrandrManager *manager, log_msg ("------------------------------------------------------------\nSTARTING XRANDR PLUGIN\n"); manager->priv->rw_screen = mate_rr_screen_new (gdk_screen_get_default (), error); - g_signal_connect (manager->priv->rw_screen, "screen-changed", G_CALLBACK (on_randr_event), manager); if (manager->priv->rw_screen == NULL) { log_msg ("Could not initialize the RANDR plugin%s%s\n", @@ -2347,6 +2346,8 @@ msd_xrandr_manager_start (MsdXrandrManager *manager, return FALSE; } + g_signal_connect (manager->priv->rw_screen, "screen-changed", G_CALLBACK (on_randr_event), manager); + log_msg ("State of screen at startup:\n"); log_screen (manager->priv->rw_screen); -- cgit v1.2.1