diff options
| author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-08-20 20:22:24 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2018-10-21 20:01:34 +0200 |
| commit | a94b0ecde01d021795c6c29a90d60a45f9198e2d (patch) | |
| tree | 6cb955bdbe1ddc7e555a9e50acdfbd081b34b582 /src/calcurse.c | |
| parent | 37d8725e7883b02d089fd3497c1c7801130a0a58 (diff) | |
| download | calcurse-a94b0ecde01d021795c6c29a90d60a45f9198e2d.tar.gz calcurse-a94b0ecde01d021795c6c29a90d60a45f9198e2d.zip | |
Fix window update after hook execution
The introduction of hooks raised a problem with window updates. The diagnosis
in commit feb059e8 (Fix segmentation fault on reload with pre-load hook) was
right, the cure was wrong.
The problem is wins_update(), not the listbox contents. The wins_update() call
does not belong in wins_unprepare_external() (or in io_reload_data()), but at a
higher level. It should be called _after_ reload, as indeed it is in
key_generic_reload() when the listbox contents have been updated (todo as well
as appointments). The call was introduced in commit 8ae75f3 without comment.
The todo updates in io_reload_data() also belong in key_generic_reload() where
they were before commit 7f06c252.
When saving data, all panels must be updated in case a hook was executed.
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/calcurse.c b/src/calcurse.c index 8e1978e..920cbcd 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -272,17 +272,19 @@ static inline void key_generic_help(void) static inline void key_generic_save(void) { io_save_cal(IO_SAVE_DISPLAY_BAR); - wins_update(FLAG_STA); + wins_update(FLAG_ALL); } static inline void key_generic_reload(void) { if (io_reload_data()) { + 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); } + wins_update(FLAG_ALL); } static inline void key_generic_import(void) |