surivive XRandR returning weird results for some dual-screen setups. This

2007-05-22  Jens Granseuer  <jensgr@gmx.net>

	* 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
This commit is contained in:
Jens Granseuer 2007-05-22 17:46:43 +00:00 committed by Jens Granseuer
parent fdaca460c4
commit 29c6ddb8cc
2 changed files with 14 additions and 4 deletions

View file

@ -1,3 +1,10 @@
2007-05-22 Jens Granseuer <jensgr@gmx.net>
* 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 <rodrigo@gnome-db.org>
* display-properties.desktop.in.in: renamed Bugzilla product.

View file

@ -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;
}