From acadbdb5c9034ce4e1d97f91b618cf8ff95d2bcc Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Wed, 3 Oct 2018 12:10:19 +0800
Subject: [PATCH] Fix potential NPE

Related: 3323ea2be07fa6cbdb6ea4412187ced51d09308c
---
 .../jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java
index 73d9dd02f..ac595f509 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java
@@ -86,7 +86,13 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
         right.getStyleClass().setAll("toggle-icon4");
         FXUtils.setLimitWidth(right, 40);
         FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(),
-                newGraphic -> right.getChildren().setAll(newGraphic));
+                newGraphic -> {
+                    if (newGraphic == null) {
+                        right.getChildren().clear();
+                    } else {
+                        right.getChildren().setAll(newGraphic);
+                    }
+                });
         root.setRight(right);
 
         FXUtils.onChangeAndOperate(skinnable.actionButtonVisibleProperty(),