From 7fc08ba0e50a9dc1fb986e087aa6e3115f01badc Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Tue, 21 Mar 2017 15:47:16 +0100 Subject: [PATCH] Merge pull request #680 from Stevie-O/slow-startup-with-glib-2.49.3 Fix slow startup with glib 2.49.3 (cherry picked from commit 3d4ba86a91b4f246665259c1e2100f5768e89237) --- src/fe-text/irssi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index ad79e0c4..b5df47c9 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -317,22 +317,22 @@ int main(int argc, char **argv) /* Does the same as g_main_run(main_loop), except we can call our dirty-checker after each iteration */ while (!quitting) { - term_refresh_freeze(); - g_main_iteration(TRUE); - term_refresh_thaw(); - if (reload_config) { - /* SIGHUP received, do /RELOAD */ + /* SIGHUP received, do /RELOAD */ reload_config = FALSE; - signal_emit("command reload", 1, ""); + signal_emit("command reload", 1, ""); } dirty_check(); + + term_refresh_freeze(); + g_main_iteration(TRUE); + term_refresh_thaw(); } g_main_destroy(main_loop); textui_deinit(); - session_upgrade(); /* if we /UPGRADEd, start the new process */ + session_upgrade(); /* if we /UPGRADEd, start the new process */ return 0; }