From bc48de371e8efc0950738e2777a37a5eff398fe7 Mon Sep 17 00:00:00 2001
From: DavidXanatos <xanatosdavid@gmail.com>
Date: Thu, 22 Dec 2022 19:26:29 +0100
Subject: [PATCH] 1.6.3a

---
 CHANGELOG.md                      |  4 ++++
 SandboxiePlus/SandMan/SandMan.cpp | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ec2deff..375aa384 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.6.3a / 5.61.3] - 2022-12-??
 
+### Added
+- added option to disable box clean up on start [#2553](https://github.com/sandboxie-plus/Sandboxie/issues/2553)
+
 ### Fixed
 - fixed issue with auto delete box on sandman start [#2555](https://github.com/sandboxie-plus/Sandboxie/issues/2555)
 
 
+
 ## [1.6.3 / 5.61.3] - 2022-12-21
 
 ### Changed
diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp
index c8e73f1c..27715f89 100644
--- a/SandboxiePlus/SandMan/SandMan.cpp
+++ b/SandboxiePlus/SandMan/SandMan.cpp
@@ -1808,15 +1808,18 @@ void CSandMan::OnStatusChanged()
 				theAPI->CreateBox(DefaultBox);
 			}
 
-			//
-			// clean up Auto Delete boxes after reboot
-			//
+			if (theConf->GetBool("Options/CleanUpOnStart", false)) {
 
-			theAPI->UpdateProcesses(false, ShowAllSessions());
+				//
+				// clean up Auto Delete boxes after reboot
+				//
 
-			foreach(const CSandBoxPtr& pBox, AllBoxes) {
-				if(pBox->GetActiveProcessCount() == 0)
-					OnBoxClosed(pBox);
+				theAPI->UpdateProcesses(false, ShowAllSessions());
+
+				foreach(const CSandBoxPtr & pBox, AllBoxes) {
+					if (pBox->GetActiveProcessCount() == 0)
+						OnBoxClosed(pBox);
+				}
 			}
 		}