From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 7 Feb 2021 16:38:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.19~2
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=8d0c4194d67dbd4816948328f5a4f90977fa7b4f;hp=cd3d9c4aed4f0f9b19b9c536f4b9153ca30c290e

Merge remote-tracking branch 'origin/master' into v2.x
---

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index e8bfa5f..fcf7e1f 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -165,6 +165,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 				ui.layout(true, true);
 				setState(ui, LOGIN);
 			} else {
+				if (LOGIN.equals(state))
+					state = null;
 				CmsSession cmsSession = cmsView.getCmsSession();
 				if (ui.getUserDir() == null) {
 					if (cmsView.isAnonymous()) {