Revert parented_ptr for TrackCollectionManager in main window

Manual deletion is required to enforce the correct order of destruction. This commit also fixes a double free bug caused by introducing parented_ptr.
mixxxdj · Nov 25, 2019 · 69faf56 · 69faf56 · daschuer · Nov 25, 2019
1 parent 44596b6
commit 69faf56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
@@ -349,7 +349,7 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
 
     launchProgress(30);
 
-    m_pTrackCollectionManager = make_parented<TrackCollectionManager>(
+    m_pTrackCollectionManager = new TrackCollectionManager(
             this,
             pConfig,
             m_pDbConnectionPool);

diff --git a/src/mixxx.h b/src/mixxx.h
@@ -29,7 +29,6 @@
 #include "util/cmdlineargs.h"
 #include "util/timer.h"
 #include "util/db/dbconnectionpool.h"
-#include "util/parented_ptr.h"
 #include "soundio/sounddeviceerror.h"
 
 class ChannelHandleFactory;
@@ -178,7 +177,7 @@ class MixxxMainWindow : public QMainWindow {
     // The Mixxx database connection pool
     mixxx::DbConnectionPoolPtr m_pDbConnectionPool;
 
-    parented_ptr<TrackCollectionManager> m_pTrackCollectionManager;
+    TrackCollectionManager* m_pTrackCollectionManager;
 
     // The library management object
     Library* m_pLibrary;