projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a couple of visibility specifiers that were missing
[ardour.git]
/
libs
/
gtkmm2ext
/
gtk_ui.cc
diff --git
a/libs/gtkmm2ext/gtk_ui.cc
b/libs/gtkmm2ext/gtk_ui.cc
index 9c20da0f4c2eea27e7cfe7cca65eb181d39237f3..33841cd0beb6821c61a5927c2a848437e1eeb2f7 100644
(file)
--- a/
libs/gtkmm2ext/gtk_ui.cc
+++ b/
libs/gtkmm2ext/gtk_ui.cc
@@
-43,6
+43,7
@@
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/gui_thread.h"
#include "i18n.h"
#include "i18n.h"
@@
-120,9
+121,9
@@
UI::UI (string namestr, int *argc, char ***argv)
UI::~UI ()
{
UI::~UI ()
{
+ _receiver.hangup ();
}
}
-
bool
UI::caller_is_ui_thread ()
{
bool
UI::caller_is_ui_thread ()
{
@@
-265,12
+266,14
@@
UI::run (Receiver &old_receiver)
Glib::signal_idle().connect (bind_return (mem_fun (old_receiver, &Receiver::hangup), false));
Glib::signal_idle().connect (bind_return (mem_fun (old_receiver, &Receiver::hangup), false));
- starting ();
+ if (starting ()) {
+ return;
+ }
+
_active = true;
theMain->run ();
_active = false;
_active = true;
theMain->run ();
_active = false;
- stopping ();
- _receiver.hangup ();
+
return;
}
return;
}