core/singleton: fix PostReloadHook in singletons

src/core/generation.cpp

@@ -55,16 +55,18 @@ void EngineGeneration::onReload(EngineGeneration* old) {
 	delete old;
 
 	if (old != nullptr) {
-		QTimer::singleShot(0, [this]() {
+		QTimer::singleShot(0, [this]() { this->postReload(); });
-			QuickshellPlugin::runOnReload();
-			PostReloadHook::postReloadTree(this->root);
-		});
 	} else {
-		QuickshellPlugin::runOnReload();
+		this->postReload();
-		PostReloadHook::postReloadTree(this->root);
 	}
 }
 
+void EngineGeneration::postReload() {
+	QuickshellPlugin::runOnReload();
+	PostReloadHook::postReloadTree(this->root);
+	this->singletonRegistry.onPostReload();
+}
+
 void EngineGeneration::setWatchingFiles(bool watching) {
 	if (watching) {
 		if (this->watcher == nullptr) {

src/core/generation.hpp

@@ -44,6 +44,7 @@ private slots:
 	void incubationControllerDestroyed();
 
 private:
+	void postReload();
 	void assignIncubationController();
 	QVector<QQmlIncubationController*> incubationControllers;
 };

src/core/singleton.cpp

@@ -51,3 +51,9 @@ void SingletonRegistry::onReload(SingletonRegistry* old) {
 		singleton->onReload(old == nullptr ? nullptr : old->registry.value(url));
 	}
 }
+
+void SingletonRegistry::onPostReload() {
+	for (auto* singleton: this->registry.values()) {
+		PostReloadHook::postReloadTree(singleton);
+	}
+}

src/core/singleton.hpp

@@ -26,6 +26,7 @@ public:
 
 	void registerSingleton(const QUrl& url, Singleton* singleton);
 	void onReload(SingletonRegistry* old);
+	void onPostReload();
 
 private:
 	QHash<QUrl, Singleton*> registry;