CHANGELOG.md

@@ -117,7 +117,7 @@
 - Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042, #5043, #5045)
 - Dev: Autogenerate docs/plugin-meta.lua. (#5055)
 - Dev: Refactor `NetworkPrivate`. (#5063)
-- Dev: Refactor `Paths` & `Updates`, focusing on reducing their singletoniability. (#5092)
+- Dev: Refactor `Paths` & `Updates`, focusing on reducing their singletoniability. (#5093)
 - Dev: Removed duplicate scale in settings dialog. (#5069)
 - Dev: Fix `NotebookTab` emitting updates for every message. (#5068)
 - Dev: Added benchmark for parsing and building recent messages. (#5071)

src/Application.cpp

@@ -120,7 +120,7 @@ Application::Application(Settings &_settings, const Paths &paths,
     , toasts(&this->emplace<Toasts>())
     , imageUploader(&this->emplace<ImageUploader>())
     , seventvAPI(&this->emplace<SeventvAPI>())
-    , crashHandler(&this->emplace(new CrashHandler(paths)))
+    , crashHandler(&this->emplace<CrashHandler>(new CrashHandler(paths)))
 
     , commands(&this->emplace<CommandController>())
     , notifications(&this->emplace<NotificationController>())

src/singletons/Theme.cpp

@@ -228,7 +228,7 @@ void Theme::initialize(Settings &settings, const Paths &paths)
         },
         false);
 
-    this->loadAvailableThemes(paths);
+    this->loadAvailableThemes();
 
     this->update();
 }
@@ -328,11 +328,11 @@ std::vector<std::pair<QString, QVariant>> Theme::availableThemes() const
     return packagedThemes;
 }
 
-void Theme::loadAvailableThemes(const Paths &paths)
+void Theme::loadAvailableThemes()
 {
     this->availableThemes_ = Theme::builtInThemes;
 
-    auto dir = QDir(paths.themesDirectory);
+    auto dir = QDir(getIApp()->getPaths().themesDirectory);
     for (const auto &info :
          dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name))
     {

src/singletons/Theme.hpp

@@ -169,7 +169,7 @@ private:
      *
      * NOTE: This is currently not built to be reloadable
      **/
-    void loadAvailableThemes(const Paths &paths);
+    void loadAvailableThemes();
 
     std::optional<ThemeDescriptor> findThemeByKey(const QString &key);