fix #31281

Author: wschweer

libmscore/edit.cpp

@@ -2436,17 +2436,21 @@ void Score::checkSpanner(int startTick, int endTick)
                   Segment* seg = tick2segmentMM(s->tick(), false, Segment::Type::ChordRest);
                   if (!seg || !seg->element(s->track()))
                         sl.append(s);
-                  seg = tick2segmentMM(s->tick2(), false, Segment::Type::ChordRest);
-                  if (!seg || !seg->element(s->track2()))
-                        sl.append(s);
+                  else {
+                        seg = tick2segmentMM(s->tick2(), false, Segment::Type::ChordRest);
+                        if (!seg || !seg->element(s->track2()))
+                              sl.append(s);
+                        }
                   }
             else {
                   // remove spanner if there is no start element
                   s->computeStartElement();
                   if (!s->startElement())
                         sl.append(s);
-                  if (s->tick2() > lastTick)
-                        s->undoChangeProperty(P_ID::SPANNER_TICKS, lastTick - s->tick());
+                  else {
+                        if (s->tick2() > lastTick)
+                              s->undoChangeProperty(P_ID::SPANNER_TICKS, lastTick - s->tick());
+                        }
                   }
             }
       for (auto s : sl)       // actually remove scheduled spanners

libmscore/spannermap.cpp

@@ -74,7 +74,7 @@ void SpannerMap::addSpanner(Spanner* s)
       // check if spanner already in list
       for (auto i = begin(); i != end(); ++i) {
             if (i->second == s) {
-                  qFatal("SpannerMap::addSpanner: already in list %p", s);
+                  qFatal("SpannerMap::addSpanner: %s already in list %p", s->name(), s);
                   }
             }
 #endif

mscore/CMakeLists.txt

@@ -38,7 +38,7 @@ QT4_WRAP_UI (ui_headers
       insertmeasuresdialog.ui editinstrument.ui editstyle.ui instrdialog.ui instrwidget.ui
       measuresdialog.ui pagesettings.ui mixer.ui playpanel.ui prefsdialog.ui measureproperties.ui
       textpalette.ui  timedialog.ui symboldialog.ui  shortcutcapturedialog.ui  editdrumset.ui
-      editstaff.ui voltaproperties.ui timesigproperties.ui boxproperties.ui
+      editstaff.ui voltaproperties.ui timesigproperties.ui
       instrwizard.ui timesigwizard.ui newwizard.ui aboutbox.ui aboutmusicxmlbox.ui
       transposedialog.ui lineproperties.ui excerptsdialog.ui  stafftext.ui tupletdialog.ui
       glissandoprop.ui articulation.ui metaedit.ui palette.ui select.ui
@@ -128,7 +128,7 @@ QT4_WRAP_CPP (mocs
       measureproperties.h seq.h textpalette.h textstyle.h selectionwindow.h
       timedialog.h symboldialog.h shortcutcapturedialog.h simplebutton.h
       greendotbutton.h recordbutton.h editdrumset.h editstaff.h selinstrument.h
-      voltaproperties.h timesigproperties.h boxproperties.h newwizard.h
+      voltaproperties.h timesigproperties.h newwizard.h
       transposedialog.h lineproperties.h
       excerptsdialog.h stafftextproperties.h glissandoproperties.h
       articulationprop.h metaedit.h magbox.h
@@ -233,7 +233,7 @@ add_executable ( ${ExecutableName}
       debugger/debugger.cpp menus.cpp importmidi.cpp
       musescore.cpp navigator.cpp pagesettings.cpp palette.cpp
       mixer.cpp playpanel.cpp selectionwindow.cpp preferences.cpp measureproperties.cpp
-      seq.cpp boxproperties.cpp textpalette.cpp
+      seq.cpp textpalette.cpp
       timedialog.cpp symboldialog.cpp shortcutcapturedialog.cpp
       simplebutton.cpp musedata.cpp
       # exportly.cpp