Crates: only store or activate sibling crate if it's valid

mixxxdj · Jul 28, 2023 · db8ce6a · db8ce6a
1 parent cde8402
commit db8ce6a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/library/trackset/crate/cratefeature.cpp b/src/library/trackset/crate/cratefeature.cpp
@@ -862,7 +862,10 @@ void CrateFeature::storePrevSiblingCrateId(CrateId crateId) {
             TreeItem* pTreeItem = m_pSidebarModel->getItem(newIndex);
             DEBUG_ASSERT(pTreeItem != nullptr);
             if (!pTreeItem->hasChildren()) {
-                m_prevSiblingCrate = crateIdFromIndex(newIndex);
+                CrateId prevCrateId = crateIdFromIndex(newIndex);
+                if (prevCrateId.isValid()) {
+                    m_prevSiblingCrate = prevCrateId;
+                }
             }
         }
     }
@@ -877,7 +880,9 @@ void CrateFeature::slotCrateTableChanged(CrateId crateId) {
         if (!activateCrate(m_crateTableModel.selectedCrate())) {
             // probably last clicked crate was deleted, try to
             // select the stored sibling
-            activateCrate(m_prevSiblingCrate);
+            if (m_prevSiblingCrate.isValid()) {
+                activateCrate(m_prevSiblingCrate);
+            }
         }
     } else {
         // No valid selection to restore