Deduplicate PanCacheData destroying

[geeqie.git] / src / pan-view / pan-item.cc

diff --git a/src/pan-view/pan-item.cc b/src/pan-view/pan-item.cc
index e81fad7..0b8d591 100644 (file)
--- a/src/pan-view/pan-item.cc
+++ b/src/pan-view/pan-item.cc
@@ -640,9 +640,7 @@ static void pan_item_image_find_size(PanWindow *pw, PanItem *pi, gint w, gint h)
                        pi->height = MAX(1, pc->cd->height * pw->image_size / 100);
 
                        pw->cache_list = g_list_remove(pw->cache_list, pc);
-                       cache_sim_data_free(pc->cd);
-                       file_data_unref(pc->fd);
-                       g_free(pc);
+                       pan_cache_data_free(pc);
                        return;
                        }
                }
@@ -989,4 +987,20 @@ void pan_text_alignment_calc(PanTextAlignment *ta, PanItem *box)
                y += height;
                }
 }
+
+
+/*
+ *-----------------------------------------------------------------------------
+ * cache data
+ *-----------------------------------------------------------------------------
+ */
+
+void pan_cache_data_free(PanCacheData *pc)
+{
+       if (!pc) return;
+
+       cache_sim_data_free(pc->cd);
+       file_data_unref(pc->fd);
+       g_free(pc);
+}
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */