diff options
Diffstat (limited to 'libs/gtkmm2ext/gtk_ui.cc')
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 8 |
1 files changed, 7 insertions, 1 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(); } } |