Merge pull request #366 from mgavioli/Fix_21121_Pasting_unstyled_text…

…_crashes Fix #21121 - Pasting unstyled text causes crash
musescore · May 18, 2013 · cd7698d · cd7698d
2 parents 910ccf3 + 10a529a
commit cd7698d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -834,7 +834,7 @@ Element* ChordRest::drop(const DropData& data)
                   {
                   Text* f = static_cast<Text*>(e);
                   int st = f->textStyleType();
-                  if (st != TEXT_STYLE_UNKNOWN)
+                  if (st >= TEXT_STYLE_DEFAULT)
                         f->setTextStyleType(st);
                   }
                   score()->undoAddElement(e);
@@ -848,9 +848,8 @@ Element* ChordRest::drop(const DropData& data)
                   fb->setTrack( (track() / VOICES) * VOICES );
                   fb->setTicks( duration().ticks() );
                   fb->setOnNote(true);
-                  /* FiguredBass * fbNew =*/ FiguredBass::addFiguredBassToSegment(segment(),
+                  FiguredBass::addFiguredBassToSegment(segment(),
                         fb->track(), fb->ticks(), &bNew);
-                  // fbNew = fb;
                   if (bNew)
                         score()->undoAddElement(e);
                   return e;