summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-06-23 22:06:47 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-06-23 22:06:47 +0000
commit6aa60b4d51d59200956f976e99d56b799a3a2c0c (patch)
treebbee8cc26fd5ca77523a2466bbaef8c30b25690d /gtk2_ardour/ardour_ui.cc
parentb52004a77770fa8d451c2fe6e2c44d43c68cde67 (diff)
ensure that ALL xrun handling is done from the GUI thread
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3487 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
-rw-r--r--gtk2_ardour/ardour_ui.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b5a19e388e..9e3e576e27 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2914,7 +2914,6 @@ ARDOUR_UI::keyboard_settings () const
void
ARDOUR_UI::create_xrun_marker(nframes_t where)
{
- ENSURE_GUI_THREAD (bind(mem_fun(*this, &ARDOUR_UI::create_xrun_marker), where));
editor->mouse_add_new_marker (where, false, true);
}
@@ -2929,6 +2928,8 @@ ARDOUR_UI::halt_on_xrun_message ()
void
ARDOUR_UI::xrun_handler(nframes_t where)
{
+ ENSURE_GUI_THREAD (bind(mem_fun(*this, &ARDOUR_UI::xrun_handler), where));
+
if (Config->get_create_xrun_marker() && session->actively_recording()) {
create_xrun_marker(where);
}