From 71e134617c28756c0ca4c7f801fd9bdf70ad43cc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 18 Jul 2008 19:03:54 +0000 Subject: [PATCH] Avoid a crash svn path=/trunk/; revision=20863 --- ChangeLog | 7 +++++++ gdk/directfb/gdkvisual-directfb.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a85af01a7a..053a0a9a3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-18 Matthias Clasen + + Bug 543217 – GTK application crashed with directfb backend + + * gdk/directfb/gdkvisual-directfb.c: Avoid a crash in + _gdk_visual_init(). Patch by Huimin He. + 2008-07-18 Federico Mena Quintero * demos/gtk-demo/changedisplay.c (find_toplevel_at_pointer): Don't diff --git a/gdk/directfb/gdkvisual-directfb.c b/gdk/directfb/gdkvisual-directfb.c index ae5800d01d..43ecb83b4d 100644 --- a/gdk/directfb/gdkvisual-directfb.c +++ b/gdk/directfb/gdkvisual-directfb.c @@ -137,7 +137,7 @@ _gdk_visual_init () to ensure the base format ARGB LUT8 RGB etc then add ones supported by the hardware */ - for (i = 0, c = 0; i < G_N_ELEMENTS (formats); i++) + for (i = 0; i < G_N_ELEMENTS (formats); i++) { IDirectFBSurface *src; DFBAccelerationMask acc; @@ -157,8 +157,7 @@ _gdk_visual_init () if (acc & DFXL_BLIT || formats[i] == dlc.pixelformat) { - system_visual = GDK_VISUAL (visuals[c]); - c++; + system_visual = GDK_VISUAL (visuals[i]); } src->Release (src);