diff options
| author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-08-22 20:18:36 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2018-10-21 20:01:34 +0200 |
| commit | ab0fe682255f01e75b70a6ee3e95795020be8dd7 (patch) | |
| tree | cb609e63b8c0d69f0d2449832ee2c4c79ff35f30 /src/calcurse.c | |
| parent | 8c2ccebe3500accf57675553a88f55496eec394a (diff) | |
| download | calcurse-ab0fe682255f01e75b70a6ee3e95795020be8dd7.tar.gz calcurse-ab0fe682255f01e75b70a6ee3e95795020be8dd7.zip | |
Reload data after resolving save conflict (improved)
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>
Diffstat (limited to 'src/calcurse.c')
| -rw-r--r-- | src/calcurse.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/calcurse.c b/src/calcurse.c index 5a08d53..7739c0f 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -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); } |