fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop/start the notify main thread at the right level

Browse Source 
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>
This commit is contained in:
Lars Henriksen 2018-08-20 20:45:43 +02:00 committed by Lukas Fleischer
parent a94b0ecde0
commit a5ae7256b3
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/io.c
View File

@ -944,9 +944,6 @@ int io_reload_data(void)
if (!io_check_data_files_modified()) if (!io_check_data_files_modified())
goto cleanup; goto cleanup;
if (notify_bar())
notify_stop_main_thread();
/* Reinitialize data structures. */ /* Reinitialize data structures. */
apoint_llist_free(); apoint_llist_free();
event_llist_free(); event_llist_free();
@ -970,11 +967,7 @@ int io_reload_data(void)
keys_wait_for_any_key(win[KEY].p); keys_wait_for_any_key(win[KEY].p);
} }
if (notify_bar())
notify_start_main_thread();
ret = 1; ret = 1;
cleanup: cleanup:
mem_free(msg_um_asktype); mem_free(msg_um_asktype);
return ret; return ret;