fix #58596 for DOM parser

musescore · May 3, 2015 · 9f20471 · 9f20471
1 parent 9e964d9
commit 9f20471
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/mscore/importxml.cpp b/mscore/importxml.cpp
@@ -4840,16 +4840,11 @@ void MusicXml::xmlNotations(Note* note, ChordRest* cr, int trk, int tick, int ti
                         if (slur[slurNo].isStart()) {
                               // slur stop when slur already started: wrap up
                               Slur* newSlur = slur[slurNo].slur();
-                              if(cr->isGrace()){
-                                    newSlur->setAnchor(Spanner::Anchor::CHORD);
-                                    newSlur->setEndElement(newSlur->startElement());
-                                    newSlur->setStartElement(cr);
-                                    }
-                              else {
+                              if(!(cr->isGrace())){
                                     newSlur->setTick2(tick);
                                     newSlur->setTrack2(track);
-                                    newSlur->setEndElement(cr);
                                     }
+                              newSlur->setEndElement(cr);
                               slur[slurNo] = SlurDesc();
                               }
                         else if (slur[slurNo].isStop())
@@ -4858,8 +4853,10 @@ void MusicXml::xmlNotations(Note* note, ChordRest* cr, int trk, int tick, int ti
                         else {
                               // slur stop for new slur: init
                               Slur* newSlur = new Slur(score);
-                              newSlur->setTick2(tick);
-                              newSlur->setTrack2(track);
+                              if(!(cr->isGrace())){
+                                    newSlur->setTick2(tick);
+                                    newSlur->setTrack2(track);
+                                    }
                               newSlur->setEndElement(cr);
                               slur[slurNo].stop(newSlur);
                               }