diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2017-05-25 21:06:36 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2017-05-26 08:48:04 +1000 |
| commit | af8d027fc598326ba25e3246ae4a31e1f29eea0c (patch) | |
| tree | 8b13d07e9074e6a1cbb64ea7f403a1d1e8b44448 | |
| parent | 3747d1688c2198d77e1fbb2902ebd84e90028d76 (diff) | |
Remove attempt to retrieve invalid Meterbridge properties
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.
| -rw-r--r-- | gtk2_ardour/meterbridge.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index e032792024..09ad83350d 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -494,19 +494,10 @@ Meterbridge::set_state (const XMLNode& node) m_root_y = 1; if ((geometry = find_named_node (node, "geometry")) != 0) { - - if (!geometry->get_property ("x_size", m_width)) { - geometry->get_property ("x-size", m_width); - } - 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); - } + geometry->get_property ("x-size", m_width); + geometry->get_property ("y-size", m_height); + geometry->get_property ("x-pos", m_root_x); + geometry->get_property ("y-pos", m_root_y); } set_window_pos_and_size (); |