fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unset modification flag after merging

Browse Source 
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>
This commit is contained in:
Lukas Fleischer 2017-09-08 21:14:42 +02:00
parent f69698569f
commit e943a8a4db
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/io.c
View File

@ -473,6 +473,8 @@ static void io_merge_data(void)
mem_free(path_apts_new); mem_free(path_apts_new);
mem_free(path_todo_new); mem_free(path_todo_new);
io_unset_modified();
/* /*
* We do not directly write to the data files here; however, the * We do not directly write to the data files here; however, the
* external merge tool will likely have incorporated changes from the * external merge tool will likely have incorporated changes from the