From 3f5d82f8b03e819e50977a5023de8c0b76d3c56f Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 27 Nov 2014 00:36:49 +0100
Subject: [PATCH] Handle case if content item is used in settings (wizard not
 set)

---
 .../gui/main/account/content/fiat/FiatAccountView.java       | 3 ++-
 .../gui/main/account/content/irc/IrcAccountView.java         | 2 +-
 .../gui/main/account/content/password/PasswordView.java      | 5 +++--
 .../main/account/content/registration/RegistrationView.java  | 5 +----
 .../main/account/content/restrictions/RestrictionsView.java  | 3 ++-
 .../gui/main/account/content/seedwords/SeedWordsView.java    | 3 ++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
index 6f3fe62bac..6166179d71 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
@@ -151,7 +151,8 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
 
     @FXML
     void onCompleted() {
-        wizard.nextStep(this);
+        if (wizard != null)
+            wizard.nextStep(this);
     }
 
     @FXML
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
index e90be13b86..b2d2ece238 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
@@ -152,7 +152,7 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
 
     @FXML
     void onSave() {
-        if (model.requestSaveBankAccount().isValid)
+        if (wizard != null && model.requestSaveBankAccount().isValid)
             wizard.nextStep(this);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
index a4c3badcb1..e03309c237 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
@@ -64,7 +64,7 @@ public class PasswordView extends InitializableView<GridPane, PasswordViewModel>
 
     @FXML
     private void onSaved() {
-        if (model.requestSavePassword())
+        if (wizard != null && model.requestSavePassword())
             wizard.nextStep(this);
         else
             log.debug(model.getErrorMessage()); // TODO use validating passwordTF
@@ -72,7 +72,8 @@ public class PasswordView extends InitializableView<GridPane, PasswordViewModel>
 
     @FXML
     private void onSkipped() {
-        wizard.nextStep(this);
+        if (wizard != null)
+            wizard.nextStep(this);
     }
 
     @FXML
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
index 3cd5998567..35c2b86980 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
@@ -109,11 +109,8 @@ public class RegistrationView extends InitializableView<GridPane, RegistrationVi
                     @Override
                     public void handle(ActionEvent actionEvent) {
                         getProperties().put("type", "CLOSE");
-                        try {
+                        if (wizard != null)
                             wizard.nextStep(RegistrationView.this);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
                         Dialog.Actions.CLOSE.handle(actionEvent);
                         overlayManager.removeBlurContent();
                     }
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
index 37990b6ae1..cf23635cfd 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
@@ -122,7 +122,7 @@ public class RestrictionsView extends ActivatableViewAndModel<GridPane, Restrict
     }
 
     @FXML
-    private void onOpenArbitratorScreen(){
+    private void onOpenArbitratorScreen() {
         View view = viewLoader.load(ArbitratorBrowserView.class);
         showStage(view);
     }
@@ -130,6 +130,7 @@ public class RestrictionsView extends ActivatableViewAndModel<GridPane, Restrict
 
     @FXML
     private void onCompleted() {
+        if (wizard != null)
             wizard.nextStep(this);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
index 8f89ee1a6c..d5640f51b8 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
@@ -60,7 +60,8 @@ public class SeedWordsView extends InitializableView<GridPane, SeedWordsViewMode
 
     @FXML
     private void onCompleted() {
-        wizard.nextStep(this);
+        if (wizard != null)
+            wizard.nextStep(this);
     }
 
     @FXML