This commit is contained in:
DavidXanatos 2022-09-18 10:52:18 +02:00
parent bb21d34df8
commit 572fb7d3cf
1 changed files with 4 additions and 2 deletions

View File

@ -1522,11 +1522,13 @@ void CSandMan::OnStatusChanged()
int PortableRootDir = theConf->GetInt("Options/PortableRootDir", 2); int PortableRootDir = theConf->GetInt("Options/PortableRootDir", 2);
if (PortableRootDir == 2) if (PortableRootDir == 2)
{ {
QString NtBoxRoot = theAPI->GetGlobalSettings()->GetText("FileRootPath", "\\??\\%SystemDrive%\\Sandbox\\%USER%\\%SANDBOX%", false, false).replace("GlobalSettings", "BoxName");
bool State = false; bool State = false;
PortableRootDir = CCheckableMessageBox::question(this, "Sandboxie-Plus", PortableRootDir = CCheckableMessageBox::question(this, "Sandboxie-Plus",
tr("Sandboxie-Plus was started in portable mode, do you want to put the Sandbox folder into its parent directory?\nYes will choose: %1\nNo will choose: %2") tr("Sandboxie-Plus was started in portable mode, do you want to put the Sandbox folder into its parent directory?\nYes will choose: %1\nNo will choose: %2")
.arg(BoxPath) .arg(BoxPath)
.arg("C:\\Sandbox") // todo resolve os drive properly .arg(theAPI->Nt2DosPath(NtBoxRoot))
, tr("Don't show this message again."), &State, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes, QMessageBox::Information) == QDialogButtonBox::Yes ? 1 : 0; , tr("Don't show this message again."), &State, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes, QMessageBox::Information) == QDialogButtonBox::Yes ? 1 : 0;
if (State) if (State)
@ -1602,7 +1604,7 @@ void CSandMan::OnStatusChanged()
auto AllBoxes = theAPI->GetAllBoxes(); auto AllBoxes = theAPI->GetAllBoxes();
foreach(const QString & Key, theConf->ListKeys("SizeCache")) { foreach(const QString & Key, theConf->ListKeys("SizeCache")) {
if (!AllBoxes.contains(Key.toLower())) if (!AllBoxes.contains(Key.toLower()) || !theConf->GetBool("Options/WatchBoxSize", false))
theConf->DelValue("SizeCache/" + Key); theConf->DelValue("SizeCache/" + Key);
} }