X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fgui_object.cc;h=3e21f82fa424280bd76d56991081b0c5bc7453f3;hb=0b55529ec42c7130421ba37f0762cec83e1e4df3;hp=84c9fe7c673088e6a847c372c6756fa42d557c03;hpb=5a53f2f1b9977e909f7720c9aa30333b0ec0572b;p=ardour.git diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc index 84c9fe7c67..3e21f82fa4 100644 --- a/gtk2_ardour/gui_object.cc +++ b/gtk2_ardour/gui_object.cc @@ -38,6 +38,7 @@ GUIObjectState::get_node (const XMLNode* parent, const string& id) { XMLNodeList const & children = parent->children (); for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { + if ((*i)->name() != X_("Object")) { continue; } @@ -81,6 +82,7 @@ string GUIObjectState::get_string (const string& id, const string& prop_name, bool* empty) { XMLNode* child = get_node (&_state, id); + if (!child) { if (empty) { *empty = true; @@ -126,13 +128,6 @@ GUIObjectState::load (const XMLNode& node) (void) set_state (node); } -GUIObjectState& -GUIObjectState::operator= (const GUIObjectState& other) -{ - _state = other._state; - return *this; -} - std::list GUIObjectState::all_ids () const {