From 04db4c788c8bf5070eb13b9165277ea81ab50070 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 2 Jan 2011 12:45:29 +0000 Subject: [PATCH] Fix some confusion about handling of route extra XML. Fixes #3574. git-svn-id: svn://localhost/ardour2/branches/3.0@8409 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/route_ui.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index aa75ee0b36..d004f8cb73 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1294,8 +1294,8 @@ RouteUI::ensure_xml_node () xml_node = new XMLNode ("GUI"); _route->add_extra_xml (*xml_node); } else { - /* the Route has one, so it must have been loaded */ - if (Stateful::loading_state_version < 3000) { + /* the Route has one; it may have been loaded */ + if (Stateful::loading_state_version != 0 && Stateful::loading_state_version < 3000) { /* the GUI extra XML is in 2.X format; we must convert it to the new format to avoid problems later */ @@ -1320,6 +1320,7 @@ RouteUI::ensure_xml_node () } _route->add_extra_xml (*new_xml_node); + xml_node = new_xml_node; } } }