From 2f7a2e1b19153dc8b13415bc006dd8d2f08fea11 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 3 Mar 2025 21:43:11 +0000
Subject: [PATCH] Various fixes [stage]

---
 .../java/io/xpipe/app/storage/DataStorage.java   |  8 ++++----
 .../io/xpipe/core/process/StubShellControl.java  |  6 ++++++
 dist/changelogs/15.3_incremental.md              | 16 +++++++++-------
 version                                          |  2 +-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index 71bbdc117..eee61d23c 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -528,9 +528,12 @@ public abstract class DataStorage {
             if (!storeClassMatch) {
                 return true;
             }
+            DataStore merged = ((FixedChildStore) pair.getKey().getStore())
+                    .merge(pair.getValue().getStore().asNeeded());
+            var mergedStoreChanged = pair.getKey().getStore() != merged;
 
             if (pair.getKey().getStorePersistentState() == null || pair.getValue().get().getStorePersistentState() == null) {
-                return true;
+                return !mergedStoreChanged;
             }
 
             var stateClassMatch = pair.getKey()
@@ -541,9 +544,6 @@ public abstract class DataStorage {
                 return true;
             }
 
-            DataStore merged = ((FixedChildStore) pair.getKey().getStore())
-                    .merge(pair.getValue().getStore().asNeeded());
-            var mergedStoreChanged = pair.getKey().getStore() != merged;
             var stateChange = !pair.getKey()
                     .getStorePersistentState()
                     .equals(pair.getValue().get().getStorePersistentState());
diff --git a/core/src/main/java/io/xpipe/core/process/StubShellControl.java b/core/src/main/java/io/xpipe/core/process/StubShellControl.java
index 27b29015a..b4c49e632 100644
--- a/core/src/main/java/io/xpipe/core/process/StubShellControl.java
+++ b/core/src/main/java/io/xpipe/core/process/StubShellControl.java
@@ -6,6 +6,12 @@ public class StubShellControl extends WrapperShellControl {
         super(parent);
     }
 
+    @Override
+    public ShellControl start() throws Exception {
+        super.start();
+        return this;
+    }
+
     @Override
     public boolean canHaveSubshells() {
         return parent.canHaveSubshells();
diff --git a/dist/changelogs/15.3_incremental.md b/dist/changelogs/15.3_incremental.md
index a2743040c..67f9a5438 100644
--- a/dist/changelogs/15.3_incremental.md
+++ b/dist/changelogs/15.3_incremental.md
@@ -1,9 +1,11 @@
-- Adjust custom icons when having a bad contrast in dark mode
-- Fix some custom icons showing up even if they are blank
-- Fix some dark mode detection on Linux systems
-- Fix file transfer stop button not working if transfer was stuck already
-- Fix default scaling factor calculation on KDE
-- Fix NullPointer for some old Proxmox VMs
-- Fix Proxmox VMs not updating after VM was changed if vmid stayed the same
 - Fix SSH connections failing when file system the key was on did not support some operations
 - Fix tailscale connections not reflecting custom hostname change
+- Fix file transfer stop button not working if transfer was stuck already
+- Fix NullPointer for some old Proxmox VMs
+- Fix newly created identities not filling out default values when created
+- Fix custom icons having a bad contrast in dark mode by generating a light variant
+- Fix some custom icons showing up even if they are blank
+- Fix some dark mode detection on Linux systems
+- Fix default scaling factor calculation on KDE
+- Fix file creation dialog intersecting with docked terminal windows
+- Fix file creation option not showing always when right-clicking
diff --git a/version b/version
index 1f92dbaa8..1d92bf049 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-15.3-10
+15.3-11