From 377d822958ec57c8fe39716d8af129c3ff258eaf Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Dec 2020 11:32:00 +0100
Subject: [PATCH] Better deal with missing layer when anonymous.

---
 .../src/org/argeo/suite/ui/SuiteUi.java       | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
index cad5a9b..d93c3a8 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
@@ -90,15 +90,16 @@ class SuiteUi extends Composite {
 
 	private Composite getLayer(String id, Node context) {
 		if (!layers.containsKey(id))
-			throw new IllegalArgumentException("No layer " + id + " is available.");
+			return null;
 		if (!workAreas.containsKey(id))
 			initLayer(id, layers.get(id), context);
 		return workAreas.get(id);
 	}
 
 	Composite switchToLayer(String layerId, Node context) {
+		Composite current = null;
 		if (currentLayerId != null) {
-			Composite current = getCurrentWorkArea();
+			current = getCurrentWorkArea();
 			if (currentLayerId.equals(layerId))
 				return current;
 		}
@@ -107,16 +108,20 @@ class SuiteUi extends Composite {
 				context = userDir;
 		}
 		Composite toShow = getLayer(layerId, context);
-		currentLayerId = layerId;
-		if (!isDisposed())
-			getDisplay().syncExec(() -> {
-				if (!toShow.isDisposed())
-					toShow.moveAbove(null);
-				else
-					log.warn("Cannot show work area because it is disposed.");
-				dynamicArea.layout(true, true);
-			});
-		return toShow;
+		if (toShow != null) {
+			currentLayerId = layerId;
+			if (!isDisposed())
+				getDisplay().syncExec(() -> {
+					if (!toShow.isDisposed())
+						toShow.moveAbove(null);
+					else
+						log.warn("Cannot show work area because it is disposed.");
+					dynamicArea.layout(true, true);
+				});
+			return toShow;
+		} else {
+			return current;
+		}
 	}
 
 	Composite switchToLayer(SuiteLayer layer, Node context) {
-- 
2.30.2