summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-09-14 14:34:45 +0000
committerFlorian Jung <flo@windfisch.org>2011-09-14 14:34:45 +0000
commitc63df0e2262d5caae54706b83e685a59616ace12 (patch)
treea24903bede84d48805a8a3ea4b2974afbbe8c12e /muse2
parent350e8db071e6f5c8af34a6890b02096da826223c (diff)
fixed arranger-related config loading errors
Diffstat (limited to 'muse2')
-rw-r--r--muse2/muse/arranger/arrangerview.cpp6
-rw-r--r--muse2/muse/conf.cpp8
2 files changed, 10 insertions, 4 deletions
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index 06d41802..0a57ce8b 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -434,7 +434,7 @@ void ArrangerView::readConfiguration(Xml& xml)
xml.unknown("ArrangerView");
break;
case Xml::TagEnd:
- if (tag == "arranger")
+ if (tag == "arrangerview")
return;
default:
break;
@@ -448,9 +448,9 @@ void ArrangerView::readConfiguration(Xml& xml)
void ArrangerView::writeConfiguration(int level, Xml& xml)
{
- xml.tag(level++, "arranger");
+ xml.tag(level++, "arrangerview");
TopWin::writeConfiguration(ARRANGER, level, xml);
- xml.tag(level, "/arranger");
+ xml.tag(level, "/arrangerview");
}
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index 3fb09c2a..6ba4d47d 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -916,8 +916,14 @@ void readConfiguration(Xml& xml, bool readOnlySequencer)
LMaster::readConfiguration(xml);
else if (tag == "marker")
MarkerView::readConfiguration(xml);
- else if (tag == "arranger")
+ else if (tag == "arrangerview")
ArrangerView::readConfiguration(xml);
+ else if (tag == "arranger") {
+ if (MusEGlobal::muse && MusEGlobal::muse->arranger())
+ MusEGlobal::muse->arranger()->readStatus(xml);
+ else
+ xml.skip(tag);
+ }
else if (tag == "dialogs")
read_function_dialog_config(xml);
else if (tag == "shortcuts")