deselecting a part now also deselects the track

2 files changed, 30 insertions, 26 deletions

diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index cf376042..56d68ceb 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -828,25 +828,29 @@ void PartCanvas::mousePress(QMouseEvent* event)
             }
       QPoint pt = event->pos();
       CItem* item = items.find(pt);
-      if (item == 0 && _tool!=AutomationTool)
-            return;
+
       switch (_tool) {
             default:
-                  emit trackChanged(item->part()->track());
+                  if (item)
+                      emit trackChanged(item->part()->track());
+                  else
+                      emit trackChanged(NULL);
                   break;
             case CutTool:
-                  splitItem(item, pt);
+                  if (item) splitItem(item, pt);
                   break;
             case GlueTool:
-                  glueItem(item);
+                  if (item) glueItem(item);
                   break;
             case MuteTool:
                   {
-                  NPart* np = (NPart*) item;
-                  Part*  p = np->part();
-                  p->setMute(!p->mute());
-                  redraw();
-                  break;
+                  if (item) {
+                      NPart* np = (NPart*) item;
+                      Part*  p = np->part();
+                      p->setMute(!p->mute());
+                      redraw();
+                      break;
+                      }
                   }
             case AutomationTool:
                     if (automation.controllerState != doNothing)
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index 6fe2f31d..903c78ba 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -1384,24 +1384,24 @@ void TList::mousePressEvent(QMouseEvent* ev)
 //   selectTrack
 //---------------------------------------------------------
 void TList::selectTrack(Track* tr)
-      {
-      song->deselectTracks();
-      tr->setSelected(true);
-      
+{
+    song->deselectTracks();
 
-      // rec enable track if expected
-      TrackList recd = getRecEnabledTracks();
-      if (recd.size() == 1 && config.moveArmedCheckBox) { // one rec enabled track, move rec enabled with selection
-        song->setRecordFlag((Track*)recd.front(),false);
-        song->setRecordFlag(tr,true);
-      }
+    if (tr) {
+        tr->setSelected(true);
 
-      // By T356. Force a redraw for wave tracks, since it does not seem to happen.
-      //if(!tr->isMidiTrack())
-        redraw();
-      ///emit selectionChanged();
-      emit selectionChanged(tr);
-      }
+
+        // rec enable track if expected
+        TrackList recd = getRecEnabledTracks();
+        if (recd.size() == 1 && config.moveArmedCheckBox) { // one rec enabled track, move rec enabled with selection
+            song->setRecordFlag((Track*)recd.front(),false);
+            song->setRecordFlag(tr,true);
+        }
+    }
+
+    redraw();
+    emit selectionChanged(tr);
+}
 
 //---------------------------------------------------------
 //   selectTrackAbove