This commit is contained in:
DavidXanatos 2024-02-25 17:45:20 +01:00
parent 5b2cf70e4f
commit 2bb54ee2c7
2 changed files with 6 additions and 4 deletions

View File

@ -2265,6 +2265,7 @@ void CSandMan::OnBoxClosed(const CSandBoxPtr& pBox)
AddAsyncOp(pProgress, true, tr("Executing OnBoxTerminate: %1").arg(Value2));
}
}
if (!pBox->GetBool("NeverDelete", false))
{
if (pBox->GetBool("AutoDelete", false))
@ -2635,6 +2636,7 @@ void CSandMan::SetupHotKeys()
if (theConf->GetBool("Options/EnablePauseForceKey", false))
m_pHotkeyManager->registerHotkey(theConf->GetString("Options/PauseForceKeySequence", "Ctrl+Alt+F"), HK_FORCE);
if (theConf->GetBool("Options/EnableSuspendKey", false))
m_pHotkeyManager->registerHotkey(theConf->GetString("Options/SuspendKeySequence", "Ctrl+Pause"), HK_SUSPEND);
}
@ -2659,10 +2661,8 @@ void CSandMan::OnHotKey(size_t id)
case HK_SUSPEND:
{
for (auto each : theAPI->GetAllBoxes()) {
for (auto each : theAPI->GetAllBoxes())
each->SetSuspendedAll(TRUE);
};
break;
}

View File

@ -231,7 +231,9 @@ void COptionsWindow::LoadAdvanced()
AddTriggerItem(Value, eAutoExec);
foreach(const QString & Value, m_pBox->GetTextList("OnFileRecovery", m_Template))
AddTriggerItem(Value, eRecoveryCheck);
foreach(const QString& Value, m_pBox->GetTextList("OnBoxTerminate", m_Template))
foreach(const QString & Value, m_pBox->GetTextList("OnBoxDelete", m_Template))
AddTriggerItem(Value, eDeleteCmd);
foreach(const QString & Value, m_pBox->GetTextList("OnBoxTerminate", m_Template))
AddTriggerItem(Value, eTerminateCmd);
ShowTriggersTmpl();