Update SandMan.cpp

sandboxie-plus · Jul 28, 2021 · 1b0a38d · 1b0a38d
1 parent 291e55b
commit 1b0a38d
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp
@@ -1221,12 +1221,13 @@ SB_STATUS CSandMan::ConnectSbieImpl()
 {
 	SB_STATUS Status = theAPI->Connect(theConf->GetBool("Options/UseInteractiveQueue", true));
 
-	if (Status.GetStatus() == 0xC0000038L /*STATUS_DEVICE_ALREADY_ATTACHED*/) {
-		OnLogMessage(tr("CAUTION: Another agent (probably SbieCtrl.exe) is already managing this Sandboxie session, please close it first and reconnect to take over."));
-		return SB_OK;
-	}
+	if (Status && !CSbieAPI::IsSbieCtrlRunning()) // don't take over when SbieCtrl is up and running
+		Status = theAPI->TakeOver();
 
-	return Status;
+	if (!Status)
+		return Status;
+
+	return SB_OK;
 }
 
 SB_STATUS CSandMan::DisconnectSbie()