From 29c6ddb8cc7277c16e4af369f15589281f899ebf Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Tue, 22 May 2007 17:46:43 +0000 Subject: [PATCH] surivive XRandR returning weird results for some dual-screen setups. This 2007-05-22 Jens Granseuer * main.c: (get_current_resolution): surivive XRandR returning weird results for some dual-screen setups. This fixes the crash in bug #356520, but a proper fix for handling this situation is still necessary, unless this is just a driver/X bug... svn path=/trunk/; revision=7646 --- capplets/display/ChangeLog | 7 +++++++ capplets/display/main.c | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/capplets/display/ChangeLog b/capplets/display/ChangeLog index f369ff3bd..f823e68d4 100644 --- a/capplets/display/ChangeLog +++ b/capplets/display/ChangeLog @@ -1,3 +1,10 @@ +2007-05-22 Jens Granseuer + + * main.c: (get_current_resolution): surivive XRandR returning weird + results for some dual-screen setups. This fixes the crash in bug + #356520, but a proper fix for handling this situation is still + necessary, unless this is just a driver/X bug... + 2007-04-27 Rodrigo Moya * display-properties.desktop.in.in: renamed Bugzilla product. diff --git a/capplets/display/main.c b/capplets/display/main.c index a3314f8e4..b5af73018 100644 --- a/capplets/display/main.c +++ b/capplets/display/main.c @@ -155,10 +155,13 @@ get_current_resolution (struct ScreenInfo *screen_info) GtkTreeIter iter; int i = 0; - gtk_combo_box_get_active_iter (combo, &iter); - gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter, - COL_ID, &i, - -1); + if (gtk_combo_box_get_active_iter (combo, &iter)) + { + gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter, + COL_ID, &i, + -1); + } + return i; }