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

Reload data after resolving save conflict (improved)

Browse Source 
After resolving a save conflict with the merge tool, a save operation has,
in effect, occurred, and data files must be reloaded to import the result of
the conflict resolution.

This is a replacement for commit 2fe9c7e. The operations concerned with the user
interface are kept out the io-operations (as in all other cases) and take place
at the command-level in calcurse.c. and not at the io-level (io.c).

Shorter, more concise prompt texts.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen
2018-08-22 20:18:36 +02:00
committed by Lukas Fleischer
parent 8c2ccebe35
commit ab0fe68225
3 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/calcurse.c
View File

@@ -271,7 +271,13 @@ static inline void key_generic_help(void)
static inline void key_generic_save(void)
{
io_save_cal(IO_SAVE_DISPLAY_BAR);
if (io_save_cal(IO_SAVE_DISPLAY_BAR) == IO_SAVE_RELOAD) {
ui_todo_load_items();
ui_todo_sel_reset();
do_storage(0);
notify_check_next_app(1);
ui_calendar_monthly_view_cache_set_invalid();
}
wins_update(FLAG_ALL);
}