From d2ab3ebf8eb3ccab97337c6648bfff53dbe8766f Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 10 Sep 2025 04:45:52 +0000
Subject: [PATCH] Small fixes

---
 .../main/java/io/xpipe/app/browser/action/BrowserAction.java  | 1 +
 .../io/xpipe/app/browser/file/BrowserFileSystemTabModel.java  | 2 +-
 app/src/main/java/io/xpipe/app/storage/DataStateHandler.java  | 4 ++++
 .../io/xpipe/ext/base/service/ServiceAddressRotation.java     | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java b/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java
index ed75b4b82..13a151663 100644
--- a/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java
+++ b/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java
@@ -41,6 +41,7 @@ public abstract class BrowserAction extends StoreAction<FileSystemStore> {
                 model = (BrowserFileSystemTabModel) found.get();
                 var target = getTargetDirectory(model);
                 model.cdSync(target.toString());
+                model.startIfNeeded();
             } else {
                 model = BrowserFullSessionModel.DEFAULT.openFileSystemSync(
                         ref.asNeeded(),
diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
index 29ded8542..1fd561521 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
@@ -197,7 +197,7 @@ public final class BrowserFileSystemTabModel extends BrowserStoreSessionTab<File
         });
     }
 
-    private void startIfNeeded() throws Exception {
+    public void startIfNeeded() throws Exception {
         var s = fileSystem.getShell();
         if (s.isPresent()) {
             s.get().start();
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStateHandler.java b/app/src/main/java/io/xpipe/app/storage/DataStateHandler.java
index ef3b08ae4..e4f51101f 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStateHandler.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStateHandler.java
@@ -85,6 +85,10 @@ public class DataStateHandler {
     }
 
     public boolean canCacheToStorage(DataStore store) {
+        if (DataStorage.get() == null) {
+            return false;
+        }
+
         var entry = DataStorage.get().getStoreEntryIfPresent(store, true).or(() -> DataStorage.get()
                 .getStoreEntryInProgressIfPresent(store));
         return entry.isPresent();
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceAddressRotation.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceAddressRotation.java
index cd42c6bc2..945b9f807 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceAddressRotation.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceAddressRotation.java
@@ -19,7 +19,7 @@ public class ServiceAddressRotation {
         }
 
         var alias = aliases[counter++ % aliases.length];
-        var replaced = url.replace("localhost", alias);
+        var replaced = url.replaceFirst("localhost", alias);
         replacedUrls.put(url, replaced);
         return replaced;
     }