projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7857ec8
)
markers are not allowed to have empty names, especially since it causes a crash in...
author
Paul Davis
<paul@linuxaudiosystems.com>
Thu, 12 Nov 2009 14:21:20 +0000
(14:21 +0000)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Thu, 12 Nov 2009 14:21:20 +0000
(14:21 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@6072
d708f5d6
-7413-0410-9779-
e7cbd77b26cf
gtk2_ardour/marker.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/marker.cc
b/gtk2_ardour/marker.cc
index 3df253b4acec848f4f070f979c99d8c38990a4c0..9cf5969fd76736f486262545918a58e1eb758cc7 100644
(file)
--- 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