allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

add a timeout to flush_pending()

Browse Source 
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.
This commit is contained in:
Robin Gareus
2016-07-25 14:13:52 +02:00
parent 42b20f15a2
commit 3953879d4d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/gtkmm2ext/gtk_ui.cc
View File

@@ -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();
}
}

2
libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
View File

@@ -136,7 +136,7 @@ class LIBGTKMM2EXT_API UI : public AbstractUI<UIRequest>
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&);