diff options
author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-08-23 20:45:38 +0200 |
---|---|---|
committer | Lukas Fleischer <lfleischer@calcurse.org> | 2018-10-21 20:01:34 +0200 |
commit | 5ad0019b2326e4012299e36682669ca767f39cd4 (patch) | |
tree | 08ebd6a2b9a4a7ee2826d89bb973dea8c11181a2 /src/calcurse.c | |
parent | ab0fe682255f01e75b70a6ee3e95795020be8dd7 (diff) | |
download | calcurse-5ad0019b2326e4012299e36682669ca767f39cd4.tar.gz calcurse-5ad0019b2326e4012299e36682669ca767f39cd4.zip |
Only reload if data files were changed (replacement)
This is a replacement for commits 57dd3d6 and 912124b.
The idea is to move the check for modified files and the list initialization
into io_load_data(), and let io_load_data() decide what to load. A new
argument is used to force a load.
The return code from new_data() (the renamed version of
io_check_data_files_modified()) tells which files have changed.
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 | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/calcurse.c b/src/calcurse.c index 7739c0f..533f78c 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -551,15 +551,6 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif /* ENABLE_NLS */ - /* Thread-safe data structure init */ - apoint_llist_init(); - recur_apoint_llist_init(); - - /* Initialize non-thread-safe data structures. */ - event_llist_init(); - recur_event_llist_init(); - todo_init_list(); - /* * Begin by parsing and handling command line arguments. * The data path is also initialized here. @@ -627,11 +618,7 @@ int main(int argc, char **argv) config_load(); wins_erase_status_bar(); io_load_keys(conf.pager); - - run_hook("pre-load"); - io_load_data(NULL); - run_hook("post-load"); - + io_load_data(NULL, FORCE); wins_slctd_set(conf.default_panel); wins_resize(); /* |