delay show password dialog until initial app window open has completed

sparrowwallet · Sep 6, 2024 · 31f2871 · 31f2871
1 parent e131f64
commit 31f2871
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/src/main/java/com/sparrowwallet/sparrow/SparrowDesktop.java b/src/main/java/com/sparrowwallet/sparrow/SparrowDesktop.java
@@ -89,28 +89,31 @@ public void start(Stage stage) throws Exception {
 
         AppController appController = AppServices.newAppWindow(stage);
 
-        if(createNewWallet) {
-            appController.newWallet(null);
-        }
+        final boolean showNewWallet = createNewWallet;
+        javafx.application.Platform.runLater(() -> {
+            if(showNewWallet) {
+                appController.newWallet(null);
+            }
 
-        List<File> recentWalletFiles = Config.get().getRecentWalletFiles();
-        if(recentWalletFiles != null) {
-            //Preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
-            List<File> encryptedWalletFiles = recentWalletFiles.stream().filter(Storage::isEncrypted).collect(Collectors.toList());
-            List<File> sortedWalletFiles = new ArrayList<>(recentWalletFiles);
-            sortedWalletFiles.removeAll(encryptedWalletFiles);
-            sortedWalletFiles.addAll(encryptedWalletFiles);
-
-            for(File walletFile : sortedWalletFiles) {
-                if(walletFile.exists()) {
-                    appController.openWalletFile(walletFile, false);
+            List<File> recentWalletFiles = Config.get().getRecentWalletFiles();
+            if(recentWalletFiles != null) {
+                //Preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
+                List<File> encryptedWalletFiles = recentWalletFiles.stream().filter(Storage::isEncrypted).collect(Collectors.toList());
+                List<File> sortedWalletFiles = new ArrayList<>(recentWalletFiles);
+                sortedWalletFiles.removeAll(encryptedWalletFiles);
+                sortedWalletFiles.addAll(encryptedWalletFiles);
+
+                for(File walletFile : sortedWalletFiles) {
+                    if(walletFile.exists()) {
+                        appController.openWalletFile(walletFile, false);
+                    }
                 }
             }
-        }
 
-        AppServices.openFileUriArgumentsAfterWalletLoading(stage);
+            AppServices.openFileUriArgumentsAfterWalletLoading(stage);
 
-        AppServices.get().start();
+            AppServices.get().start();
+        });
     }
 
     @Override