Merge pull request #20 from uklotzde/jmigual-library-redesign-hotfix

Hotfix for SIGSEGV
mixxxdj · Jul 6, 2017 · b156da1 · b156da1
2 parents 40c27aa + 356585b
commit b156da1
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/library/features/crates/cratefeature.cpp b/src/library/features/crates/cratefeature.cpp
@@ -44,7 +44,8 @@ CrateFeature::CrateFeature(UserSettingsPointer pConfig,
         : LibraryFeature(pConfig, pLibrary, pTrackCollection, parent),
           m_cratesIcon(":/images/library/ic_library_crates.png"),
           m_lockedCrateIcon(":/images/library/ic_library_locked.png"),
-          m_pTrackCollection(pTrackCollection) {
+          m_pTrackCollection(pTrackCollection),
+          m_pCrateTableModel(nullptr) {
 
     initActions();
 
@@ -321,8 +322,13 @@ bool CrateFeature::activateCrate(CrateId crateId) {
         return false;
     }
     m_lastRightClickedIndex = index;
-    m_pCrateTableModel->selectCrate(crateId);
-    emit(showTrackModel(m_pCrateTableModel));
+    // TODO(XXX): How to select the newly created crate without
+    // a corresponding table model? m_pCrateTableModel = nullptr
+    // when creating crates by clicking the link on the HTML view.
+    if (m_pCrateTableModel) {
+        m_pCrateTableModel->selectCrate(crateId);
+        emit(showTrackModel(m_pCrateTableModel));
+    }
     emit(enableCoverArtDisplay(true));
     // Update selection
     emit(featureSelect(this, m_lastRightClickedIndex));