Mercurial > geeqie

changeset 617:aa883b6d2ef6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
image_osd_info_render(): if there's no fd, just return.
author zas_
date Fri, 09 May 2008 12:43:10 +0000
parents d9c9d05c9d4d
children b1a922a32d9c
files src/image-overlay.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/image-overlay.c	Fri May 09 12:33:24 2008 +0000
+++ b/src/image-overlay.c	Fri May 09 12:43:10 2008 +0000
@@ -283,6 +283,9 @@
     	gint w, h;
 	GHashTable *vars;
 	ImageWindow *imd = osd->imd;
+	FileData *fd = image_get_fd(imd);
+
+	if (!fd) return NULL;
 
 	vars = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
 
@@ -389,10 +392,6 @@
 	g_hash_table_destroy(vars);
 
 	{
-	FileData *fd = image_get_fd(imd);
-
-	if (fd) /* fd may be null after file deletion */
-		{
 		gint active_marks = 0;
 		gint mark;
 		gchar *text2;
@@ -431,7 +430,6 @@
 			g_free(text);
 			text = text2;
 			}
-		}
 	}
 
 	layout = gtk_widget_create_pango_layout(imd->pr, NULL);