Fix window update after hook execution
The introduction of hooks raised a problem with window updates. The diagnosis in commitfeb059e8(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 commit8ae75f3without comment. The todo updates in io_reload_data() also belong in key_generic_reload() where they were before commit7f06c252. 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>
This commit is contained in:
committed by
Lukas Fleischer
parent
37d8725e78
commit
a94b0ecde0
11
src/io.c
11
src/io.c
@@ -935,7 +935,6 @@ int io_reload_data(void)
|
||||
case 3:
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
wins_update(FLAG_STA);
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
@@ -961,20 +960,10 @@ int io_reload_data(void)
|
||||
recur_event_llist_init();
|
||||
todo_init_list();
|
||||
|
||||
/*
|
||||
* Temporarily reinitialize the todo list box without any items to make
|
||||
* sure wins_unprepare_external() does not fail when it is called after
|
||||
* executing the pre-load hook.
|
||||
*/
|
||||
ui_todo_load_items();
|
||||
ui_todo_sel_reset();
|
||||
|
||||
io_load_data(NULL);
|
||||
run_hook("post-load");
|
||||
|
||||
io_unset_modified();
|
||||
ui_todo_load_items();
|
||||
ui_todo_sel_reset();
|
||||
|
||||
if (show_dialogs()) {
|
||||
status_mesg(reload_success, enter);
|
||||
|
||||
Reference in New Issue
Block a user