diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
| commit | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (patch) | |
| tree | d86752508bbd033be18301796e7d0c571a4fe1c0 /libs/gtkmm2ext/gtk_ui.cc | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | 465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544 (diff) | |
merge with master, fixing conflicts in 3 wscript files
Diffstat (limited to 'libs/gtkmm2ext/gtk_ui.cc')
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 9c20da0f4c..cd7ab1537a 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -120,9 +120,9 @@ UI::UI (string namestr, int *argc, char ***argv) UI::~UI () { + _receiver.hangup (); } - bool UI::caller_is_ui_thread () { @@ -265,12 +265,14 @@ UI::run (Receiver &old_receiver) Glib::signal_idle().connect (bind_return (mem_fun (old_receiver, &Receiver::hangup), false)); - starting (); + if (starting ()) { + return; + } + _active = true; theMain->run (); _active = false; - stopping (); - _receiver.hangup (); + return; } |