From: <wog...@us...> - 2011-04-17 21:14:34
|
Revision: 4438 http://navit.svn.sourceforge.net/navit/?rev=4438&view=rev Author: woglinde Date: 2011-04-17 21:14:28 +0000 (Sun, 17 Apr 2011) Log Message: ----------- Fix:gtk_drawing_area:Destroy the image cache hash_table only when we have no parent Modified Paths: -------------- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2011-04-16 20:35:40 UTC (rev 4437) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2011-04-17 21:14:28 UTC (rev 4438) @@ -125,7 +125,8 @@ static void graphics_destroy(struct graphics_priv *gr) { - g_hash_table_destroy(hImageData); + if (!gr->parent) + g_hash_table_destroy(hImageData); } static void @@ -224,14 +225,14 @@ } else if(curr_elem) { //found and OK -> use hashtable entry + g_free(hash_key); *w = curr_elem->w; *h = curr_elem->h; hot->x = curr_elem->w / 2 - 1; hot->y = curr_elem->h / 2 - 1; - g_free(hash_key); - g_object_ref(curr_elem->pixbuf); ret=g_new0(struct graphics_image_priv, 1); *ret = *curr_elem; + g_object_ref(ret->pixbuf); return ret; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |