Merge remote-tracking branch 'upstream/master' into merge/upstream-full
# Conflicts: # CONTRIBUTING.md # src/profanity.c # src/tools/editor.c
This commit is contained in:
@@ -150,6 +150,8 @@ prof_run(gchar* log_level, gchar* account_name, gchar* config_file, gchar* log_f
|
||||
if (!background_mode) {
|
||||
ui_update();
|
||||
}
|
||||
while (g_main_context_iteration(NULL, FALSE))
|
||||
;
|
||||
#ifdef HAVE_GTK
|
||||
tray_update();
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user