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

Reload data after resolving save conflict

Browse Source 
After resolving a save conflict with the merge tool, we need to reload
the data files to import the result of the conflict resolution.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2017-09-08 21:02:18 +02:00
parent e943a8a4db
commit 2fe9c7efce
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/io.c
View File

@ -550,8 +550,17 @@ void io_save_cal(enum save_display display)
if (read_only)
return;
if (io_check_data_files_modified() && resolve_save_conflict())
if (io_check_data_files_modified() && resolve_save_conflict()) {
if (io_reload_data()) {
day_process_storage(ui_calendar_get_slctd_day(), 1);
ui_day_load_items();
ui_day_sel_reset();
notify_check_next_app(1);
ui_calendar_monthly_view_cache_set_invalid();
wins_update(FLAG_ALL);
}
return;
}
run_hook("pre-save");
io_mutex_lock();