From af8d027fc598326ba25e3246ae4a31e1f29eea0c Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Thu, 25 May 2017 21:06:36 +1000 Subject: [PATCH] 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. --- gtk2_ardour/meterbridge.cc | 17 ++++------------- 1 file 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 ();