From 4b16380cb9eff6fe7a45eccac4c2659c692d916b Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Sun, 15 Sep 2024 13:30:11 +0200
Subject: [PATCH] 1.14.9

---
 CHANGELOG.md                                     | 6 ++++++
 SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp | 4 ++++
 SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp   | 8 ++++++++
 3 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 682c2b6d..a812cc0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - fixed Exported encrypted archive files cannot be unpacked by Sandboxie [#4229](https://github.com/sandboxie-plus/Sandboxie/issues/4229)
 
+### Added
+- Added a couple alternative default sandbox paths to the box wizard:
+  - \??\%SystemDrive%\Sandbox\%USER%\%SANDBOX%
+  - \??\%SystemDrive%\Sandbox\%SANDBOX%
+  - \??\%SystemDrive%\Users\%USER%\Sandbox\%SANDBOX%
+
 
 
 
diff --git a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
index fe357174..b76ad96c 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
@@ -339,6 +339,8 @@ void COptionsWindow::LoadGeneral()
 		ui.chkEncrypt->setEnabled(!ui.chkRamBox->isChecked());
 		ui.chkForceProtection->setEnabled(!ui.chkRamBox->isChecked());
 	}
+	ui.chkForceProtection->setEnabled(ui.chkEncrypt->isEnabled() && ui.chkEncrypt->isChecked());
+
 	CSandBoxPlus* pBoxEx = qobject_cast<CSandBoxPlus*>(m_pBox.data());
 	if (pBoxEx && QFile::exists(pBoxEx->GetBoxImagePath())) 
 	{
@@ -1147,6 +1149,8 @@ void COptionsWindow::OnDiskChanged()
 		ui.chkForceProtection->setEnabled(ui.chkEncrypt->isChecked());
 	}
 	
+	ui.chkForceProtection->setEnabled(ui.chkEncrypt->isEnabled() && ui.chkEncrypt->isChecked());
+
 	OnGeneralChanged();
 }
 
diff --git a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp
index 89587fcb..826083be 100644
--- a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp
+++ b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp
@@ -685,6 +685,14 @@ void CFilesPage::initializePage()
     m_pBoxLocation->clear();
     QString Location = theAPI->GetGlobalSettings()->GetText("FileRootPath", "\\??\\%SystemDrive%\\Sandbox\\%USER%\\%SANDBOX%");
     m_pBoxLocation->addItem(Location/*.replace("%SANDBOX%", field("boxName").toString())*/);
+    QStringList StdLocations = QStringList() 
+        << "\\??\\%SystemDrive%\\Sandbox\\%USER%\\%SANDBOX%" 
+        << "\\??\\%SystemDrive%\\Sandbox\\%SANDBOX%" 
+        << "\\??\\%SystemDrive%\\Users\\%USER%\\Sandbox\\%SANDBOX%";
+    foreach(auto StdLocation, StdLocations) {
+        if (StdLocation != Location)
+            m_pBoxLocation->addItem(StdLocation);
+    }
 }
 
 bool CFilesPage::validatePage()