fix a strange crash

FCL-Team · Mar 15, 2024 · 9030c3c · 9030c3c
1 parent 6bb51e7
commit 9030c3c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/FCL/src/main/java/com/tungsten/fcl/setting/Controllers.java b/FCL/src/main/java/com/tungsten/fcl/setting/Controllers.java
@@ -28,16 +28,19 @@ private Controllers() {
 
     private static final ObservableList<Controller> controllers = observableArrayList(controller -> new Observable[] { controller });
     private static final ReadOnlyListWrapper<Controller> controllersWrapper = new ReadOnlyListWrapper<>(controllers);
+    public static Controller DEFAULT_CONTROLLER;
 
     public static void checkControllers() {
         if (controllers.isEmpty()) {
             try {
-                String str = IOUtils.readFullyAsString(Controllers.class.getResourceAsStream("/assets/controllers/Default.json"));
-                Controller controller = new GsonBuilder()
-                        .registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
-                        .setPrettyPrinting()
-                        .create().fromJson(str, Controller.class);
-                controller.saveToDisk();
+                if (DEFAULT_CONTROLLER == null) {
+                    String str = IOUtils.readFullyAsString(Controllers.class.getResourceAsStream("/assets/controllers/Default.json"));
+                    DEFAULT_CONTROLLER = new GsonBuilder()
+                            .registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
+                            .setPrettyPrinting()
+                            .create().fromJson(str, Controller.class);
+                }
+                DEFAULT_CONTROLLER.saveToDisk();
             } catch (IOException e) {
                 Logging.LOG.log(Level.SEVERE, "Failed to generate default controller!", e.getMessage());
             }

diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/controller/ControllerUI.java b/FCL/src/main/java/com/tungsten/fcl/ui/controller/ControllerUI.java
@@ -95,7 +95,11 @@ public ControllerUI(Context context, FCLUILayout parent, int id) {
     public void onCreate() {
         super.onCreate();
 
-        selectedController.set(Controllers.controllersProperty().get(0));
+        if (Controllers.controllersProperty().size() != 0) {
+            selectedController.set(Controllers.controllersProperty().get(0));
+        } else {
+            selectedController.set(Controllers.DEFAULT_CONTROLLER);
+        }
 
         listView = findViewById(R.id.controller_list);
         importController = findViewById(R.id.import_controller);