From 17d1af181dfac0c78b9f999ce71a743cd4fdd1b5 Mon Sep 17 00:00:00 2001
From: huangyuhui <huanghongxun2008@126.com>
Date: Tue, 27 Feb 2018 23:25:10 +0800
Subject: [PATCH] Profile page title changed to display name

---
 HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java   | 5 ++++-
 HMCL/src/main/java/org/jackhuang/hmcl/ui/ProfilePage.java | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
index ea4f30d5a..096a39c56 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
@@ -487,6 +487,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
     }
 
     private void setContent(Node content, AnimationProducer animation) {
+        isWizardPageNow = false;
         animationHandler.setContent(content, animation);
 
         if (content instanceof Region) {
@@ -510,6 +511,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
 
     private String category;
     private Node nowPage;
+    private boolean isWizardPageNow;
 
     public Node getNowPage() {
         return nowPage;
@@ -573,6 +575,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
         contentPlaceHolder.getStyleClass().removeAll("gray-background", "white-background");
         contentPlaceHolder.getStyleClass().add("white-background");
         setContent(page, nav.getAnimation().getAnimationProducer());
+        isWizardPageNow = true;
     }
 
     @FXML
@@ -588,7 +591,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
 
     @FXML
     private void onBack() {
-        if (wizardController.canPrev())
+        if (isWizardPageNow && wizardController.canPrev())
             wizardController.onPrev(true);
         else
             onCloseNav();
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ProfilePage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ProfilePage.java
index 890dce392..1384c1df7 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ProfilePage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ProfilePage.java
@@ -51,15 +51,16 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
      */
     public ProfilePage(Profile profile) {
         this.profile = profile;
+        String profileDisplayName = Optional.ofNullable(profile).map(Profiles::getProfileDisplayName).orElse("");
 
         title = new SimpleStringProperty(this, "title",
-                profile == null ? Main.i18n("profile.new") : Main.i18n("profile") + " - " + profile.getName());
+                profile == null ? Main.i18n("profile.new") : Main.i18n("profile") + " - " + profileDisplayName);
         location = new SimpleStringProperty(this, "location",
                 Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(""));
 
         FXUtils.loadFXML(this, "/assets/fxml/profile.fxml");
 
-        txtProfileName.setText(Optional.ofNullable(profile).map(Profiles::getProfileDisplayName).orElse(""));
+        txtProfileName.setText(profileDisplayName);
         FXUtils.onChangeAndOperate(txtProfileName.textProperty(), it -> {
             btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
         });