summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@calcurse.org>2017-09-08 21:14:42 +0200
committerLukas Fleischer <lfleischer@calcurse.org>2017-09-08 21:22:22 +0200
commite943a8a4dbb8b5d6ad280ba2a576cdd9e7e66a63 (patch)
tree10afa64084dcdbb8dfb47d203fddb56474f7f6a3
parentf69698569ff79965580c3a8c23d9e59fc1810fc7 (diff)
downloadcalcurse-e943a8a4dbb8b5d6ad280ba2a576cdd9e7e66a63.tar.gz
calcurse-e943a8a4dbb8b5d6ad280ba2a576cdd9e7e66a63.zip
Unset modification flag after merging
Turn off the local modification flag to avoid a bogus warning when reloading the data files immediately after the merge process. Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
-rw-r--r--src/io.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/io.c b/src/io.c
index d61f4c6..0cf93dc 100644
--- a/src/io.c
+++ b/src/io.c
@@ -473,6 +473,8 @@ static void io_merge_data(void)
mem_free(path_apts_new);
mem_free(path_todo_new);
+ io_unset_modified();
+
/*
* We do not directly write to the data files here; however, the
* external merge tool will likely have incorporated changes from the