widget/wtracktableview: Do not do assignment in if statements

1 files changed, 38 insertions, 25 deletions

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 027769886f..d97cbff339 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -614,25 +614,32 @@ void WTrackTableView::slotMouseDoubleClicked(const QModelIndex &index) {
 
 void WTrackTableView::loadSelectionToGroup(QString group, bool play) {
     QModelIndexList indices = selectionModel()->selectedRows();
-    if (indices.size() > 0) {
-        // If the track load override is disabled, check to see if a track is
-        // playing before trying to load it
-        if (!(m_pConfig->getValueString(
-            ConfigKey("[Controls]","AllowTrackLoadToPlayingDeck")).toInt())) {
-            // TODO(XXX): Check for other than just the first preview deck.
-            if (group != "[PreviewDeck1]" &&
-                    ControlObject::get(ConfigKey(group, "play")) > 0.0) {
-                return;
-            }
-        }
-        QModelIndex index = indices.at(0);
-        TrackModel* trackModel = getTrackModel();
-        TrackPointer pTrack;
-        if (trackModel &&
-                (pTrack = trackModel->getTrack(index))) {
-            emit loadTrackToPlayer(pTrack, group, play);
+    if (indices.size() <= 0) {
+        return;
+    }
+
+    // If the track load override is disabled, check to see if a track is
+    // playing before trying to load it
+    if (!(m_pConfig->getValueString(
+                           ConfigKey("[Controls]", "AllowTrackLoadToPlayingDeck"))
+                        .toInt())) {
+        // TODO(XXX): Check for other than just the first preview deck.
+        if (group != "[PreviewDeck1]" &&
+                ControlObject::get(ConfigKey(group, "play")) > 0.0) {
+            return;
         }
     }
+
+    TrackModel* trackModel = getTrackModel();
+    if (!trackModel) {
+        return;
+    }
+
+    QModelIndex index = indices.at(0);
+    TrackPointer pTrack = trackModel->getTrack(index);
+    if (pTrack) {
+        emit loadTrackToPlayer(pTrack, group, play);
+    }
 }
 
 void WTrackTableView::assignPreviousTrackColor() {
@@ -641,11 +648,14 @@ void WTrackTableView::assignPreviousTrackColor() {
         return;
     }
 
-    QModelIndex index = indices.at(0);
     TrackModel* trackModel = getTrackModel();
-    TrackPointer pTrack;
-    if (trackModel &&
-            (pTrack = trackModel->getTrack(index))) {
+    if (!trackModel) {
+        return;
+    }
+
+    QModelIndex index = indices.at(0);
+    TrackPointer pTrack = trackModel->getTrack(index);
+    if (pTrack) {
         ColorPaletteSettings colorPaletteSettings(m_pConfig);
         ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
         mixxx::RgbColor::optional_t color = pTrack->getColor();
@@ -659,11 +669,14 @@ void WTrackTableView::assignNextTrackColor() {
         return;
     }
 
-    QModelIndex index = indices.at(0);
     TrackModel* trackModel = getTrackModel();
-    TrackPointer pTrack;
-    if (trackModel &&
-            (pTrack = trackModel->getTrack(index))) {
+    if (!trackModel) {
+        return;
+    }
+
+    QModelIndex index = indices.at(0);
+    TrackPointer pTrack = trackModel->getTrack(index);
+    if (pTrack) {
         ColorPaletteSettings colorPaletteSettings(m_pConfig);
         ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
         mixxx::RgbColor::optional_t color = pTrack->getColor();