Mercurial > geeqie.yaz

diff src/layout.c @ 1558:e6da3a90e7b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed metadata.confirm_on_dir_change
author nadvornik
date Tue, 21 Apr 2009 21:16:32 +0000
parents 7302ff300a52
children 9a64eda3e020
line wrap: on
line diff
--- a/src/layout.c	Tue Apr 21 21:07:28 2009 +0000
+++ b/src/layout.c	Tue Apr 21 21:16:32 2009 +0000
@@ -938,6 +938,7 @@
 gboolean layout_set_fd(LayoutWindow *lw, FileData *fd)
 {
 	gboolean have_file = FALSE;
+	gboolean dir_changed = TRUE;
 
 	if (!layout_valid(&lw)) return FALSE;
 
@@ -965,6 +966,7 @@
 		if (lw->dir_fd && strcmp(lw->dir_fd->path, base) == 0)
 			{
 			g_free(base);
+			dir_changed = FALSE;
 			}
 		else if (isdir(base))
 			{
@@ -1008,7 +1010,7 @@
 		layout_image_set_index(lw, 0);
 		}
 
-	if (options->metadata.confirm_on_dir_change)
+	if (options->metadata.confirm_on_dir_change && dir_changed)
 		metadata_write_queue_confirm(NULL, NULL);
 
 	return TRUE;