diff --git a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
index 558c368c..01fb766d 100644
--- a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
+++ b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
@@ -7,7 +7,7 @@
0
0
695
- 508
+ 565
@@ -1941,218 +1941,222 @@ Unlike the preview channel, it does not include untested, potentially breaking,
-
- 1
+ 0
Sandboxie Config
-
+
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- -
-
-
-
- 23
- 16777215
-
-
-
- ...
-
-
-
- -
-
-
- -
-
-
-
- 75
- true
- true
-
-
-
- Sandbox default
-
-
-
- -
-
-
- -
-
-
- Portable root folder
-
-
-
- -
-
-
- Sandbox <a href="sbie://docs/ipcrootpath">ipc root</a>:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
-
- -
-
-
- Default sandbox:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Use Windows Filtering Platform to restrict network access
-
-
-
- -
-
-
- Sandbox <a href="sbie://docs/filerootpath">file system root</a>:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
-
- -
-
-
- Activate Kernel Mode Object Filtering
-
-
-
- -
-
-
- Sandbox <a href="sbie://docs/keyrootpath">registry root</a>:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 75
- true
- true
-
-
-
- Sandboxing features
-
-
-
- -
-
-
- Hook selected Win32k system calls to enable GPU acceleration (experimental)
-
-
-
- -
-
-
- Use a Sandboxie login instead of an anonymous token
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
+
+
+
+ 75
+ true
+ true
+
+
+
+ Sandbox default
+
+
+
+ -
+
+
+ Default sandbox:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ -
+
+
+ Portable root folder
+
+
+
+ -
+
+
+ Sandbox <a href="sbie://docs/filerootpath">file system root</a>:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+
+ -
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ ...
+
+
+
+ -
+
+
+ Sandbox <a href="sbie://docs/keyrootpath">registry root</a>:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+
+ -
+
+
+ -
+
+
+ Sandbox <a href="sbie://docs/ipcrootpath">ipc root</a>:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+
+ -
+
+
+ -
+
+
+
+ 75
+ true
+ true
+
+
+
+ Sandboxing features
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 77
+ 20
+
+
+
+
+ -
+
+
+ Use Windows Filtering Platform to restrict network access
+
+
+
+ -
+
+
+ Activate Kernel Mode Object Filtering
+
+
+
+ -
+
+
+ Hook selected Win32k system calls to enable GPU acceleration (experimental)
+
+
+
+ -
+
+
+ Use a Sandboxie login instead of an anonymous token
+
+
+
+ -
+
+
+ Let the child processes of the default File Explorer automatically enter
+the default sandbox
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 76
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 147
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 76
+ 20
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 76
+ 20
+
+
+
diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
index a04171f7..f9e29ea1 100644
--- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
@@ -418,6 +418,7 @@ CSettingsWindow::CSettingsWindow(QWidget* parent)
connect(ui.chkObjCb, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
if (CurrentVersion.value("CurrentBuild").toInt() < 14393) // Windows 10 RS1 and later
ui.chkWin32k->setEnabled(false);
+ connect(ui.chkForceExplorerChild, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
//connect(ui.chkWin32k, SIGNAL(stateChanged(int)), this, SLOT(OnFeaturesChanged()));
m_FeaturesChanged = false;
connect(ui.chkWin32k, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged()));
@@ -948,6 +949,7 @@ void CSettingsWindow::LoadSettings()
ui.chkMinimize->setChecked(theConf->GetBool("Options/MinimizeToTray", false));
ui.chkSingleShow->setChecked(theConf->GetBool("Options/TraySingleClick", false));
+ ui.chkForceExplorerChild->setChecked(strcmp(theAPI->GetGlobalSettings()->GetText("ForceExplorerChild").toStdString().c_str(), theAPI->GetGlobalSettings()->GetText("DefalutBox").toStdString().c_str())==0);
OnLoadAddon();
bool bImDiskReady = theGUI->IsImDiskReady();
@@ -1633,7 +1635,7 @@ void CSettingsWindow::SaveSettings()
theConf->SetValue("Options/OnClose", ui.cmbOnClose->currentData());
theConf->SetValue("Options/MinimizeToTray", ui.chkMinimize->isChecked());
theConf->SetValue("Options/TraySingleClick", ui.chkSingleShow->isChecked());
-
+ theAPI->GetGlobalSettings()->SetText("ForceExplorerChild", theAPI->GetGlobalSettings()->GetText("DefaultBox"));
if (theAPI->IsConnected())
{
try