From 3953879d4d423e3d7f79b1913b4ff6fe502c6542 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 25 Jul 2016 14:13:52 +0200 Subject: [PATCH] add a timeout to flush_pending() In some circumstances UI::flush_pending never returns, and all UI interactive ends up being driven by while (gtk_events_pending()) { gtk_main_iteration(); } This has various implications depending on the caller and usually results in a crash at session-close or exit. --- libs/gtkmm2ext/gtk_ui.cc | 8 +++++++- libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index c3e94c922e..c96c31b3de 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -728,7 +728,7 @@ UI::popup_error (const string& text) } void -UI::flush_pending () +UI::flush_pending (float timeout) { if (!caller_is_ui_thread()) { error << "non-UI threads cannot call UI::flush_pending()" @@ -736,9 +736,15 @@ UI::flush_pending () return; } + int64_t end = g_get_monotonic_time () + timeout * 1e6; + gtk_main_iteration(); while (gtk_events_pending()) { + if (timeout > 0 && end < g_get_monotonic_time ()) { + cerr << "UI::flush_pending timed out after " << timeout << "s.\n"; + break; + } gtk_main_iteration(); } } diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index b9c80a34e0..dbe1739ffc 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -136,7 +136,7 @@ class LIBGTKMM2EXT_API UI : public AbstractUI void set_state (Gtk::Widget *w, Gtk::StateType state); void popup_error (const std::string& text); - void flush_pending (); + void flush_pending (float timeout = 0); void toggle_errors (); void show_errors (); void dump_errors (std::ostream&); -- 2.30.2