From e7142e4032d1cfb3569c3bfa008bb8c08baf0fda Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Mon, 19 Aug 2019 14:57:42 +0800
Subject: [PATCH] Fix displaying "null" in GameItem

---
 .../hmcl/ui/download/UpdateInstallerWizardProvider.java  | 3 ++-
 .../java/org/jackhuang/hmcl/ui/versions/GameItem.java    | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java
index 066213a31..01ee88ac5 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java
@@ -25,6 +25,7 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
 
@@ -38,7 +39,7 @@ public final class UpdateInstallerWizardProvider implements WizardProvider {
     private final String libraryId;
     private final String oldLibraryVersion;
 
-    public UpdateInstallerWizardProvider(Profile profile, String gameVersion, Version version, String libraryId, String oldLibraryVersion) {
+    public UpdateInstallerWizardProvider(@NotNull Profile profile, @NotNull String gameVersion, @NotNull Version version, @NotNull String libraryId, @NotNull String oldLibraryVersion) {
         this.profile = profile;
         this.gameVersion = gameVersion;
         this.version = version;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
index 569451823..559eba474 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
@@ -60,10 +60,11 @@ public class GameItem extends Control {
                     StringBuilder libraries = new StringBuilder(game);
                     LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getResolvedPreservingPatchesVersion(id));
                     analyzer.forEachLibrary((libraryId, libraryVersion) -> {
-                        if (I18n.hasKey("install.installer." + libraryId))
-                            libraries
-                                    .append(", ").append(i18n("install.installer." + libraryId))
-                                    .append(": ").append(modifyVersion(game, libraryVersion.replaceAll("(?i)" + libraryId, "")));
+                        if (I18n.hasKey("install.installer." + libraryId)) {
+                            libraries.append(", ").append(i18n("install.installer." + libraryId));
+                            if (libraryVersion != null)
+                                libraries.append(": ").append(modifyVersion("", libraryVersion.replaceAll("(?i)" + libraryId, "")));
+                        }
                     });
 
                     subtitle.set(libraries.toString());