From 6236f137c3f2836c84634bc7e465f71a7bffc671 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 3 Sep 2014 14:02:28 +0200 Subject: [PATCH] Fix bug with missing show() call --- src/main/java/io/bitsquare/gui/help/Help.java | 13 +++---------- src/main/java/io/bitsquare/gui/help/HelpId.java | 1 - 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/help/Help.java b/src/main/java/io/bitsquare/gui/help/Help.java index e2c35f2d28..d6e09c8d85 100644 --- a/src/main/java/io/bitsquare/gui/help/Help.java +++ b/src/main/java/io/bitsquare/gui/help/Help.java @@ -18,6 +18,7 @@ public class Help { private static final Logger log = LoggerFactory.getLogger(Help.class); private static Stage helpWindow; + /////////////////////////////////////////////////////////////////////////////////////////// // Public methods @@ -32,22 +33,14 @@ public class Help { helpWindow.initModality(Modality.NONE); helpWindow.initOwner(BitSquare.getPrimaryStage()); webView = new WebView(); - webView.getEngine().load(url.toString()); - Scene scene = new Scene(webView, 800, 600); - helpWindow.setScene(scene); - helpWindow.onCloseRequestProperty().addListener((ov, oldValue, newValue) -> { - if (oldValue != null && newValue == null) - helpWindow = null; - log.debug("closed"); - }); - - helpWindow.show(); + helpWindow.setScene(new Scene(webView, 800, 600)); } else { webView = (WebView) helpWindow.getScene().getRoot(); } helpWindow.setTitle(url.toString()); webView.getEngine().load(url.toString()); + helpWindow.show(); } catch (MalformedURLException e) { log.error(e.getMessage()); } diff --git a/src/main/java/io/bitsquare/gui/help/HelpId.java b/src/main/java/io/bitsquare/gui/help/HelpId.java index 1593c53525..5b21f4e8f6 100644 --- a/src/main/java/io/bitsquare/gui/help/HelpId.java +++ b/src/main/java/io/bitsquare/gui/help/HelpId.java @@ -4,5 +4,4 @@ public enum HelpId { CREATE_OFFER_GENERAL, CREATE_OFFER_FUNDING, CREATE_OFFER_ADVANCED - }