summaryrefslogtreecommitdiff
path: root/muse2/muse/songfile.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-16 17:03:24 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-16 17:03:24 +0000
commitac7c404804691fcf7f9b36f038025ac486ffea6a (patch)
tree7d3e6276115487f5e5dcab229401402691f0b74e /muse2/muse/songfile.cpp
parent6b5e69ff5def2c8469657e33413bec84d815df9d (diff)
half-way working version
toolbar state can be saved and restored, though this is still a bit buggy
Diffstat (limited to 'muse2/muse/songfile.cpp')
-rw-r--r--muse2/muse/songfile.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp
index d64fc6cd..fb279e92 100644
--- a/muse2/muse/songfile.cpp
+++ b/muse2/muse/songfile.cpp
@@ -1049,7 +1049,13 @@ void MusE::readToplevels(Xml& xml)
}
else if (tag == "marker") {
showMarker(true);
- toplevels.back()->readStatus(xml);
+ if (toplevels.back()->type()==TopWin::MARKER)
+ toplevels.back()->readStatus(xml);
+ }
+ else if (tag == "arrangerview") {
+ showArranger(true);
+ if (toplevels.back()->type()==TopWin::ARRANGER)
+ toplevels.back()->readStatus(xml);
}
else if (tag == "waveedit") {
if(!pl->empty())
@@ -1061,7 +1067,8 @@ void MusE::readToplevels(Xml& xml)
}
else if (tag == "cliplist") {
startClipList(true);
- toplevels.back()->readStatus(xml);
+ if (toplevels.back()->type()==TopWin::CLIPLIST)
+ toplevels.back()->readStatus(xml);
}
else
xml.unknown("MusE");