From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 23 Aug 2013 08:57:33 +0000 (+0000)
Subject: Merge fix of regression introduced by https://www.argeo.org/bugzilla/show_bug.cgi... 
X-Git-Tag: argeo-commons-2.1.30~652
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=053b2ac80fec797898271efbbff537044cd5b6f6;p=lgpl%2Fargeo-commons.git

Merge fix of regression introduced by https://argeo.org/bugzilla/show_bug.cgi?id=161

git-svn-id: https://svn.argeo.org/commons/trunk@6403 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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());