summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-11-12 14:21:20 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-11-12 14:21:20 +0000
commitab565167ff36eb473340e950d93d46c3dfaa9616 (patch)
tree3ea99d2326be03f238717842500fd47fc0cd992a
parent7857ec8b456d6fc233d1ee9b111744fc831dccca (diff)
markers are not allowed to have empty names, especially since it causes a crash in the pixbuf code
git-svn-id: svn://localhost/ardour2/branches/3.0@6072 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/marker.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 3df253b4ac..9cf5969fd7 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -359,6 +359,10 @@ Marker::set_name (const string& new_name)
uint32_t pb_width;
double font_size;
+ if (new_name.empty()) {
+ return;
+ }
+
font_size = name_font->get_size() / Pango::SCALE;
pb_width = new_name.length() * font_size;
@@ -386,7 +390,6 @@ Marker::set_name (const string& new_name)
if (_type == End || _type == LoopEnd || _type == PunchOut) {
name_pixbuf->property_x() = -(te.width);
}
-
}
void