Mercurial > geeqie

diff src/utilops.c @ 1618:552648eff4f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not block the files sent to external editors like gimp
author nadvornik
date Sun, 31 May 2009 11:08:00 +0000
parents f43e1d1299db
children 9e6cdef3bc3d
line wrap: on
line diff
--- a/src/utilops.c	Sat May 30 20:18:22 2009 +0000
+++ b/src/utilops.c	Sun May 31 11:08:00 2009 +0000
@@ -845,7 +845,18 @@
 			}
 		else
 			{
-			flags = start_editor_from_filelist_full(ud->external_command, ud->flist, file_util_perform_ci_cb, ud);
+			if (editor_blocks_file(ud->external_command))
+				{
+				DEBUG_1("Starting %s and waiting for results", ud->external_command);
+				flags = start_editor_from_filelist_full(ud->external_command, ud->flist, file_util_perform_ci_cb, ud);
+				}
+			else
+				{
+				/* start the editor without callback and finish the operation internally */
+				DEBUG_1("Starting %s and finishing the operation", ud->external_command);
+				flags = start_editor_from_filelist(ud->external_command, ud->flist);
+				file_util_perform_ci_internal(ud);
+				}
 			}
 
 		if (flags)