From 053b2ac80fec797898271efbbff537044cd5b6f6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 23 Aug 2013 08:57:33 +0000 Subject: [PATCH] Merge fix of regression introduced by https://www.argeo.org/bugzilla/show_bug.cgi?id=161 git-svn-id: https://svn.argeo.org/commons/trunk@6403 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../main/java/org/argeo/security/ui/SecurityUiPlugin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java index b6bab756b..03584185b 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java +++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java @@ -85,7 +85,10 @@ public class SecurityUiPlugin extends AbstractUIPlugin { UnsupportedCallbackException { // if (display != null) // RCP - display.get().syncExec(new Runnable() { + Display displayToUse = display.get(); + if (displayToUse == null)// RCP + displayToUse = Display.getDefault(); + displayToUse.syncExec(new Runnable() { public void run() { DefaultLoginDialog dialog = new DefaultLoginDialog(display .get().getActiveShell()); -- 2.30.2