Add support for automated clean-up on restart and improved sandbox ac…

…tion prompts
sandboxie-plus · Sep 16, 2024 · a722a4c · a722a4c
1 parent 44d1ed0
commit a722a4c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp
@@ -296,7 +296,6 @@ CSandMan::CSandMan(QWidget *parent)
 	}
 
 	connect(CSymbolProvider::Instance(), SIGNAL(StatusChanged(const QString&)), this, SLOT(OnSymbolStatus(const QString&)));
-
 	//qApp->setWindowIcon(GetIcon("IconEmptyDC", false));
 }
 
@@ -2528,15 +2527,21 @@ void CSandMan::OnStatusChanged()
 			}
 
 			UpdateForceUSB();
-
-			if (theConf->GetBool("Options/CleanUpOnStart", false)) {
+            theAPI->UpdateProcesses(0, ShowAllSessions());
+            bool bAutoRun = QApplication::arguments().contains("-autorun");
+            if(bAutoRun) {
+                foreach(
+                const CSandBoxPtr &pBox, AllBoxes) {
+                    if (pBox->GetBool("CleanAfterReboot"))
+                        DeleteBoxContent(pBox, eAuto, true);
+                }
+            }
+            if (theConf->GetBool("Options/CleanUpOnStart", false)) {
 
 				//
 				// clean up Auto Delete boxes after reboot
 				//
 
-				theAPI->UpdateProcesses(0, ShowAllSessions());
-
 				foreach(const CSandBoxPtr & pBox, AllBoxes) {
 					if (pBox->GetActiveProcessCount() == 0)
 						OnBoxClosed(pBox);

diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp
@@ -1397,12 +1397,18 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
 		if(QMessageBox::question(this, tr("Sandboxie-Plus"), 
 		tr("Do you want to make the box cleaned after machine reboot?"), 
 		QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes){
-			if(MoveFileExA(fileRoot.toStdString().c_str(),NULL,4)==0){
-				QMessageBox::warning(this, tr("Sandboxie-Plus"),
-				tr("The operation failed,please make sure that Sandman has admin privliage.")
-				, QMessageBox::Yes, 0);
-			}
-		}
+            if(QMessageBox::question(this, tr("Sandboxie-Plus"),
+            tr("Do you want to use Windows Delecting Feature(MoveFileEx)?Or we'll delete the box when Sandman.exe called by userinit.exe."),
+                QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes){
+                if(MoveFileExW(fileRoot.toStdString().c_str(),NULL,4)==0){
+                    QMessageBox::warning(this, tr("Sandboxie-Plus"),
+                    tr("The operation failed,please make sure that Sandman has admin privliage.")
+                    , QMessageBox::Yes, 0);
+                }
+            }
+            else{
+                pBox->SetBool("CleanAfterReboot",true);
+            }
 	}
 	else if (Action == m_pMenuExport)
 	{