projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct placement of buffering adjustments w.r.t Butler thread creation
[ardour.git]
/
gtk2_ardour
/
time_axis_view.cc
diff --git
a/gtk2_ardour/time_axis_view.cc
b/gtk2_ardour/time_axis_view.cc
index e3695fb411c5ae51c264a58cefa5d2d453995c27..9deb7eb3e880946e8c124ed397cde4428c23d6b1 100644
(file)
--- a/
gtk2_ardour/time_axis_view.cc
+++ b/
gtk2_ardour/time_axis_view.cc
@@
-27,6
+27,7
@@
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/stacktrace.h"
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/stacktrace.h"
+#include "pbd/unwind.h"
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/utils.h>
@@
-102,6
+103,7
@@
TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
, _y_position (0)
, _editor (ed)
, name_entry (0)
, _y_position (0)
, _editor (ed)
, name_entry (0)
+ , ending_name_edit (false)
, control_parent (0)
, _order (0)
, _effective_height (0)
, control_parent (0)
, _order (0)
, _effective_height (0)
@@
-696,6
+698,15
@@
TimeAxisView::end_name_edit (int response)
if (!name_entry) {
return;
}
if (!name_entry) {
return;
}
+
+ if (ending_name_edit) {
+ /* already doing this, and focus out or other event has caused
+ us to re-enter this code.
+ */
+ return;
+ }
+
+ PBD::Unwinder<bool> uw (ending_name_edit, true);
bool edit_next = false;
bool edit_prev = false;
bool edit_next = false;
bool edit_prev = false;