From dffc0df8766937ad0863d389883cba2ebac835d6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 7 Oct 2020 11:16:31 +0200
Subject: [PATCH] Make initialisation more robust.

---
 org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebApp.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebApp.java b/org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebApp.java
index 687b54a83..70d3917d4 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebApp.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebApp.java
@@ -32,11 +32,14 @@ public class CmsWebApp implements ApplicationConfiguration, CmsAppListener {
 	public void init(BundleContext bundleContext, Map<String, String> properties) {
 		this.bundleContext = bundleContext;
 		contextName = properties.get(CONTEXT_NAME);
+		if (cmsApp != null)
+			themingUpdated();
 //		registerIfAllThemesAvailable();
 	}
 
 	public void destroy(BundleContext bundleContext, Map<String, String> properties) {
-
+		if (cmsApp != null)
+			cmsApp.removeCmsAppListener(this);
 	}
 
 	@Override
-- 
2.30.2