Merge branch 'master' of https://github.com/love-code-yeyixiao/Sandboxie
This commit is contained in:
commit
7f67acdbc8
|
@ -2258,6 +2258,13 @@ void CSandMan::OnStartMenuChanged()
|
||||||
|
|
||||||
void CSandMan::OnBoxClosed(const CSandBoxPtr& pBox)
|
void CSandMan::OnBoxClosed(const CSandBoxPtr& pBox)
|
||||||
{
|
{
|
||||||
|
foreach(const QString & Value, pBox->GetTextList("OnBoxTerminate", true, false, true)) {
|
||||||
|
QString Value2 = pBox->Expand(Value);
|
||||||
|
CSbieProgressPtr pProgress = CSbieUtils::RunCommand(Value2, true);
|
||||||
|
if (!pProgress.isNull()) {
|
||||||
|
AddAsyncOp(pProgress, true, tr("Executing OnBoxTerminate: %1").arg(Value2));
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!pBox->GetBool("NeverDelete", false))
|
if (!pBox->GetBool("NeverDelete", false))
|
||||||
{
|
{
|
||||||
if (pBox->GetBool("AutoDelete", false))
|
if (pBox->GetBool("AutoDelete", false))
|
||||||
|
@ -4452,4 +4459,4 @@ void InitCertSlot()
|
||||||
|
|
||||||
g_MailRun = true;
|
g_MailRun = true;
|
||||||
g_MailThread = CreateThread(NULL, 0, MailThreadFunc, NULL, 0, NULL);
|
g_MailThread = CreateThread(NULL, 0, MailThreadFunc, NULL, 0, NULL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -430,7 +430,7 @@ void COptionsWindow::SaveAdvanced()
|
||||||
WriteTextList("AutoExec", AutoExec);
|
WriteTextList("AutoExec", AutoExec);
|
||||||
WriteTextList("OnFileRecovery", RecoveryCheck);
|
WriteTextList("OnFileRecovery", RecoveryCheck);
|
||||||
WriteTextList("OnBoxDelete", DeleteCommand);
|
WriteTextList("OnBoxDelete", DeleteCommand);
|
||||||
WriteTextList("OnBoxTerimate", TerminateCommand);
|
WriteTextList("OnBoxTerminate", TerminateCommand);
|
||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue