ardour/livetrax
13
0
Fork 0
Code

Remove attempt to retrieve invalid Meterbridge properties

Browse Source 
The property names with underscores are "normalized" to replace the underscores
with hyphens in the XMLProperty constructor from within Meterbridge::get_state
and so have always been written with hyphens.
This commit is contained in:
Tim Mayberry 2017-05-25 21:06:36 +10:00
parent 3747d1688c
commit af8d027fc5
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/meterbridge.cc
View File

@ -494,19 +494,10 @@ Meterbridge::set_state (const XMLNode& node)
m_root_y = 1; m_root_y = 1;
if ((geometry = find_named_node (node, "geometry")) != 0) { if ((geometry = find_named_node (node, "geometry")) != 0) {
geometry->get_property ("x-size", m_width);
if (!geometry->get_property ("x_size", m_width)) { geometry->get_property ("y-size", m_height);
geometry->get_property ("x-size", m_width); geometry->get_property ("x-pos", m_root_x);
} geometry->get_property ("y-pos", m_root_y);
if (!geometry->get_property("y_size", m_height)) {
geometry->get_property ("y-size", m_height);
}
if (!geometry->get_property ("x_pos", m_root_x)) {
geometry->get_property ("x-pos", m_root_x);
}
if (!geometry->get_property ("y_pos", m_root_y)) {
geometry->get_property ("y-pos", m_root_y);
}
} }
set_window_pos_and_size (); set_window_pos_and_size ();