summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Henriksen <LarsHenriksen@get2net.dk>2018-08-20 20:45:43 +0200
committerLukas Fleischer <lfleischer@calcurse.org>2018-10-21 20:01:34 +0200
commita5ae7256b318925419bc4d619dd428bdebbfde0f (patch)
tree31551877bb61ef0d5a65a240db2034f11ba6d9eb
parenta94b0ecde01d021795c6c29a90d60a45f9198e2d (diff)
downloadcalcurse-a5ae7256b318925419bc4d619dd428bdebbfde0f.tar.gz
calcurse-a5ae7256b318925419bc4d619dd428bdebbfde0f.zip
Stop/start the notify main thread at the right level
The thread is stopped/started in wins_prepare/unprepare_external() when hooks are run. There is no need to do it in io_reload_data(). In fact, because of the nested calls notify_stop_main_thread() <--- io_reload_data() ... notify_stop_main_thread() <--- hook/wins_prepare_external() ... notify_start_main_thread() <--- hook/wins_unprepare_external() ... notify_start_main_thread() <--- io_reload_data() the thread has been running after the first hook anyway. Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk> Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
-rw-r--r--src/io.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/io.c b/src/io.c
index 9fb9434..5401115 100644
--- a/src/io.c
+++ b/src/io.c
@@ -944,9 +944,6 @@ int io_reload_data(void)
if (!io_check_data_files_modified())
goto cleanup;
- if (notify_bar())
- notify_stop_main_thread();
-
/* Reinitialize data structures. */
apoint_llist_free();
event_llist_free();
@@ -970,11 +967,7 @@ int io_reload_data(void)
keys_wait_for_any_key(win[KEY].p);
}
- if (notify_bar())
- notify_start_main_thread();
-
ret = 1;
-
cleanup:
mem_free(msg_um_asktype);
return ret;