Wrap game feature in shared pointer.

Holt59 · Jun 1, 2024 · 629762d · 629762d
1 parent 6915910
commit 629762d
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 112 deletions.
diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
@@ -208,7 +208,7 @@ void DirectoryRefresher::addModBSAToStructure(DirectoryEntry* root,
 {
   QStringList loadOrder;
 
-  auto* gamePlugins = m_Core.gameFeatures().gameFeature<GamePlugins>();
+  auto gamePlugins = m_Core.gameFeatures().gameFeature<GamePlugins>();
   if (gamePlugins) {
     loadOrder = gamePlugins->getLoadOrder();
   }
@@ -357,7 +357,7 @@ struct ModThread
 
     if (Settings::instance().archiveParsing()) {
       QStringList loadOrder;
-      GamePlugins* gamePlugins = gameFeatures->gameFeature<GamePlugins>();
+      auto gamePlugins = gameFeatures->gameFeature<GamePlugins>();
       if (gamePlugins) {
         loadOrder = gamePlugins->getLoadOrder();
       }

diff --git a/src/game_features.cpp b/src/game_features.cpp
@@ -162,6 +162,8 @@ GameFeatures::GameFeatures(OrganizerCore* core, PluginContainer* plugins)
           });
 }
 
+GameFeatures::~GameFeatures() {}
+
 GameFeatures::CombinedModDataChecker& GameFeatures::modDataChecker() const
 {
   return dynamic_cast<CombinedModDataChecker&>(*m_modDataChecker);
@@ -176,6 +178,12 @@ void GameFeatures::updateCurrentFeatures(std::type_index const& index)
   auto& features = m_allFeatures[index];
 
   m_currentFeatures[index].clear();
+
+  // this can occur when starting MO2, just wait for the next update
+  if (!m_pluginContainer.managedGame()) {
+    return;
+  }
+
   for (const auto& dataFeature : features) {
 
     // registering plugin is disabled
@@ -202,7 +210,7 @@ void GameFeatures::updateCurrentFeatures(std::type_index const& index)
                      return std::dynamic_pointer_cast<ModDataChecker>(checker);
                    });
     modDataChecker().setCheckers(std::move(checkers));
-    emit modDataCheckerUpdated(gameFeature<ModDataChecker>());
+    emit modDataCheckerUpdated(gameFeature<ModDataChecker>().get());
   }
 
   // update mod data content
@@ -215,7 +223,7 @@ void GameFeatures::updateCurrentFeatures(std::type_index const& index)
                      return std::dynamic_pointer_cast<ModDataContent>(checker);
                    });
     modDataContent().setContents(std::move(contents));
-    emit modDataContentUpdated(gameFeature<ModDataContent>());
+    emit modDataContentUpdated(gameFeature<ModDataContent>().get());
   }
 }
 
@@ -313,20 +321,20 @@ int GameFeatures::unregisterGameFeatures(MOBase::IPlugin* plugin,
   return removed;
 }
 
-GameFeature* GameFeatures::gameFeature(std::type_info const& info) const
+std::shared_ptr<GameFeature> GameFeatures::gameFeature(std::type_info const& info) const
 {
   if (info == ModDataCheckerIndex) {
-    return modDataChecker().isValid() ? m_modDataChecker.get() : nullptr;
+    return modDataChecker().isValid() ? m_modDataChecker : nullptr;
   }
 
   if (info == ModDataContentIndex) {
-    return modDataContent().isValid() ? m_modDataContent.get() : nullptr;
+    return modDataContent().isValid() ? m_modDataContent : nullptr;
   }
 
   auto it = m_currentFeatures.find(info);
   if (it == m_currentFeatures.end() || it->second.empty()) {
     return nullptr;
   }
 
-  return it->second.front().get();
+  return it->second.front();
 }
diff --git a/src/game_features.h b/src/game_features.h
@@ -35,6 +35,8 @@ class GameFeatures : public QObject
    */
   GameFeatures(OrganizerCore* core, PluginContainer* plugins);
 
+  ~GameFeatures();
+
   // register game features
   //
   bool registerGameFeature(MOBase::IPlugin* plugin, QStringList const& games,
@@ -48,9 +50,9 @@ class GameFeatures : public QObject
   // retrieve a game feature
   //
   template <class T>
-  T* gameFeature() const
+  std::shared_ptr<T> gameFeature() const
   {
-    return dynamic_cast<T*>(gameFeature(typeid(T)));
+    return std::dynamic_pointer_cast<T>(gameFeature(typeid(T)));
   }
 
 signals:
@@ -88,7 +90,7 @@ class GameFeatures : public QObject
 
   // retrieve a game feature from info
   //
-  MOBase::GameFeature* gameFeature(std::type_info const& index) const;
+  std::shared_ptr<MOBase::GameFeature> gameFeature(std::type_info const& index) const;
 
   // update current features by filtering
   //
@@ -108,8 +110,8 @@ class GameFeatures : public QObject
   std::unordered_map<std::type_index, std::vector<std::shared_ptr<MOBase::GameFeature>>>
       m_currentFeatures;
 
-  std::unique_ptr<MOBase::ModDataChecker> m_modDataChecker;
-  std::unique_ptr<MOBase::ModDataContent> m_modDataContent;
+  std::shared_ptr<CombinedModDataChecker> m_modDataChecker;
+  std::shared_ptr<CombinedModDataContent> m_modDataContent;
 };
 
 #endif
diff --git a/src/gamefeaturesproxy.cpp b/src/gamefeaturesproxy.cpp
@@ -36,7 +36,7 @@ bool GameFeaturesProxy::unregisterFeature(std::shared_ptr<MOBase::GameFeature> f
   return m_Features.unregisterGameFeature(feature);
 }
 
-MOBase::GameFeature*
+std::shared_ptr<MOBase::GameFeature>
 GameFeaturesProxy::gameFeatureImpl(std::type_info const& info) const
 {
   return m_Features.gameFeature(info);

diff --git a/src/gamefeaturesproxy.h b/src/gamefeaturesproxy.h
@@ -3,7 +3,6 @@
 
 #include "igamefeatures.h"
 
-
 class GameFeatures;
 class OrganizerProxy;
 
@@ -23,7 +22,8 @@ class GameFeaturesProxy : public MOBase::IGameFeatures
   bool unregisterFeature(std::shared_ptr<MOBase::GameFeature> feature) override;
 
 protected:
-  MOBase::GameFeature* gameFeatureImpl(std::type_info const& info) const override;
+  std::shared_ptr<MOBase::GameFeature>
+  gameFeatureImpl(std::type_info const& info) const override;
   int unregisterFeaturesImpl(std::type_info const& info) override;
 
 private:

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1796,16 +1796,14 @@ void MainWindow::on_profileBox_currentIndexChanged(int index)
 
   activateSelectedProfile();
 
-  LocalSavegames* saveGames =
-      m_OrganizerCore.gameFeatures().gameFeature<LocalSavegames>();
+  auto saveGames = m_OrganizerCore.gameFeatures().gameFeature<LocalSavegames>();
   if (saveGames != nullptr) {
     if (saveGames->prepareProfile(m_OrganizerCore.currentProfile())) {
       m_SavesTab->refreshSaveList();
     }
   }
 
-  BSAInvalidation* invalidation =
-      m_OrganizerCore.gameFeatures().gameFeature<BSAInvalidation>();
+  auto invalidation = m_OrganizerCore.gameFeatures().gameFeature<BSAInvalidation>();
   if (invalidation != nullptr) {
     if (invalidation->prepareProfile(m_OrganizerCore.currentProfile())) {
       QTimer::singleShot(5, [this] {
@@ -1923,8 +1921,7 @@ void MainWindow::updateBSAList(const QStringList& defaultArchives,
   ui->bsaList->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
   std::vector<std::pair<UINT32, QTreeWidgetItem*>> items;
 
-  BSAInvalidation* invalidation =
-      m_OrganizerCore.gameFeatures().gameFeature<BSAInvalidation>();
+  auto invalidation = m_OrganizerCore.gameFeatures().gameFeature<BSAInvalidation>();
   std::vector<FileEntryPtr> files = m_OrganizerCore.directoryStructure()->getFiles();
 
   QStringList plugins =
@@ -2033,7 +2030,7 @@ void MainWindow::updateBSAList(const QStringList& defaultArchives,
 
 void MainWindow::checkBSAList()
 {
-  DataArchives* archives = m_OrganizerCore.gameFeatures().gameFeature<DataArchives>();
+  auto archives = m_OrganizerCore.gameFeatures().gameFeature<DataArchives>();
 
   if (archives != nullptr) {
     ui->bsaList->blockSignals(true);
@@ -2385,16 +2382,14 @@ void MainWindow::on_actionAdd_Profile_triggered()
     }
   }
 
-  LocalSavegames* saveGames =
-      m_OrganizerCore.gameFeatures().gameFeature<LocalSavegames>();
+  auto saveGames = m_OrganizerCore.gameFeatures().gameFeature<LocalSavegames>();
   if (saveGames != nullptr) {
     if (saveGames->prepareProfile(m_OrganizerCore.currentProfile())) {
       m_SavesTab->refreshSaveList();
     }
   }
 
-  BSAInvalidation* invalidation =
-      m_OrganizerCore.gameFeatures().gameFeature<BSAInvalidation>();
+  auto invalidation = m_OrganizerCore.gameFeatures().gameFeature<BSAInvalidation>();
   if (invalidation != nullptr) {
     if (invalidation->prepareProfile(m_OrganizerCore.currentProfile())) {
       QTimer::singleShot(5, [this] {

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
@@ -249,9 +249,9 @@ void ModInfo::updateFromDisc(const QString& modsDirectory, OrganizerCore& core,
     }
   }
 
-  auto* game      = core.managedGame();
-  auto& features  = core.pluginContainer().gameFeatures();
-  auto* unmanaged = features.gameFeature<UnmanagedMods>();
+  auto* game     = core.managedGame();
+  auto& features = core.pluginContainer().gameFeatures();
+  auto unmanaged = features.gameFeature<UnmanagedMods>();
   if (unmanaged != nullptr) {
     for (const QString& modName : unmanaged->mods(!displayForeign)) {
       ModInfo::EModType modType =

diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
@@ -703,7 +703,7 @@ std::vector<ModInfo::EFlag> ModInfoRegular::getFlags() const
 
 std::set<int> ModInfoRegular::doGetContents() const
 {
-  ModDataContent* contentFeature =
+  auto contentFeature =
       m_Core.pluginContainer().gameFeatures().gameFeature<ModDataContent>();
 
   if (contentFeature) {