From 4985adddf07ec48a03faa13980f47ccf2b7f1aab Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Thu, 14 Dec 2023 13:32:36 +0100
Subject: [PATCH] 1.12.4

---
 CHANGELOG.md                                 |  8 +++++---
 SandboxiePlus/QSbieAPI/Sandboxie/SandBox.cpp | 10 ++++++++--
 SandboxiePlus/SandMan/Views/SbieView.cpp     |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcaa5c8c..a4634e23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.12.4 / 5.67.4] - 2023-12-
 
+### Changed
+- without an active, non expired, supporter certificate, automatic updates/downloads are not longer available for the stable channel
+ - the autoamtic updater will still work and notify about new stable releases, the user will be guided to visit the download page and download the latest installer manually
+
 ### Fixed
 - fixed running sandboxed processes located in a imdisk volume [#3472](https://github.com/sandboxie-plus/Sandboxie/discussions/3472)
 - fixed sample 634d066fd4f9a8b201a3ddf346e880be unable to be terminate on windows 7 x64 [#3482](https://github.com/sandboxie-plus/Sandboxie/issues/3482)
 - fixed UseNewSymlinkResolver causes applications to create both the link and the target folder [#3481](https://github.com/sandboxie-plus/Sandboxie/issues/3481)
+- fixed Renaming a sandbox breaks Group hierarchy [#3430](https://github.com/sandboxie-plus/Sandboxie/issues/3430)
 
-### Changed
-- without an active, non expired, supporter certificate, automatic updates/downloads are not longer available for the stable channel
- - the autoamtic updater will still work and notify about new stable releases, the user will be guided to visit the download page and download the latest installer manually
 
 
 
diff --git a/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.cpp b/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.cpp
index da84294a..9da9fe08 100644
--- a/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.cpp
+++ b/SandboxiePlus/QSbieAPI/Sandboxie/SandBox.cpp
@@ -270,8 +270,14 @@ SB_STATUS CSandBox::RenameBox(const QString& NewName)
 				SetText("FileRootPath", FilePath.join("\\") + "\\%SANDBOX%");
 		}
 	}
-	
-	return RenameSection(NewName);
+
+	QString OldName = m_Name;
+	Status = RenameSection(NewName);
+	if (!Status.IsError()) {
+		CSandBoxPtr pBox = m_pAPI->m_SandBoxes.take(OldName.toLower());
+		if (pBox)m_pAPI->m_SandBoxes.insert(NewName.toLower(), pBox);
+	}
+	return Status;
 }
 
 SB_STATUS CSandBox::RemoveBox()
diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp
index 5269ec4d..1c1d20f5 100644
--- a/SandboxiePlus/SandMan/Views/SbieView.cpp
+++ b/SandboxiePlus/SandMan/Views/SbieView.cpp
@@ -1426,6 +1426,8 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
 				theAPI->GetGlobalSettings()->SetText("DefaultBox", Value.replace(" ", "_"));
 		}
 		Results.append(Status);
+
+		SaveBoxGrouping();
 	}
 	else if (Action == m_pMenuMount)
 	{