diff --git a/CHANGELOG.md b/CHANGELOG.md index 881916a5..562a3fcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/). + +## [1.5.3 / 5.60.3] - 2022-10-?? + +### Fixed +- fixed issue with box options [#2400](https://github.com/sandboxie-plus/Sandboxie/issues/2400) + + + ## [1.5.2 / 5.60.2] - 2022-10-?? ### Changed diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h index a52071ce..7e4e0056 100644 --- a/Sandboxie/common/my_version.h +++ b/Sandboxie/common/my_version.h @@ -21,8 +21,8 @@ #ifndef _MY_VERSION_H #define _MY_VERSION_H -#define MY_VERSION_BINARY 5,60,2 -#define MY_VERSION_STRING "5.60.2" +#define MY_VERSION_BINARY 5,60,3 +#define MY_VERSION_STRING "5.60.3" #define MY_ABI_VERSION 0x56000 // These #defines are used by either Resource Compiler or NSIS installer diff --git a/SandboxiePlus/SandMan/Windows/OptionsForce.cpp b/SandboxiePlus/SandMan/Windows/OptionsForce.cpp index dfa65a42..6c20b1b6 100644 --- a/SandboxiePlus/SandMan/Windows/OptionsForce.cpp +++ b/SandboxiePlus/SandMan/Windows/OptionsForce.cpp @@ -42,6 +42,7 @@ void COptionsWindow::LoadForced() LoadForcedTmpl(); + LoadBreakoutTmpl(); m_ForcedChanged = false; } @@ -57,13 +58,6 @@ void COptionsWindow::LoadForcedTmpl(bool bUpdate) foreach(const QString& Value, m_pBox->GetTextListTmpl("ForceFolder", Template)) AddForcedEntry(Value, (int)ePath, false, Template); - - - foreach(const QString& Value, m_pBox->GetTextListTmpl("BreakoutProcess", Template)) - AddBreakoutEntry(Value, (int)eProcess, false, Template); - - foreach(const QString& Value, m_pBox->GetTextListTmpl("BreakoutFolder", Template)) - AddBreakoutEntry(Value, (int)ePath, false, Template); } } else if (bUpdate) @@ -78,7 +72,24 @@ void COptionsWindow::LoadForcedTmpl(bool bUpdate) } i++; } + } +} +void COptionsWindow::LoadBreakoutTmpl(bool bUpdate) +{ + if (ui.chkShowBreakoutTmpl->isChecked()) + { + foreach(const QString& Template, m_pBox->GetTemplates()) + { + foreach(const QString& Value, m_pBox->GetTextListTmpl("BreakoutProcess", Template)) + AddBreakoutEntry(Value, (int)eProcess, false, Template); + + foreach(const QString& Value, m_pBox->GetTextListTmpl("BreakoutFolder", Template)) + AddBreakoutEntry(Value, (int)ePath, false, Template); + } + } + else if (bUpdate) + { for (int i = 0; i < ui.treeBreakout->topLevelItemCount(); ) { QTreeWidgetItem* pItem = ui.treeBreakout->topLevelItem(i); diff --git a/SandboxiePlus/SandMan/Windows/OptionsWindow.h b/SandboxiePlus/SandMan/Windows/OptionsWindow.h index 28760448..a9fac7db 100644 --- a/SandboxiePlus/SandMan/Windows/OptionsWindow.h +++ b/SandboxiePlus/SandMan/Windows/OptionsWindow.h @@ -76,7 +76,7 @@ private slots: void OnBreakoutBrowse(); void OnBreakoutDir(); void OnDelBreakout(); - void OnShowBreakoutTmpl() { LoadForcedTmpl(true); } + void OnShowBreakoutTmpl() { LoadBreakoutTmpl(true); } void OnAddLingering(); void OnDelStopProg(); diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h index 7c7c21da..fdc0647d 100644 --- a/SandboxiePlus/version.h +++ b/SandboxiePlus/version.h @@ -2,7 +2,7 @@ #define VERSION_MJR 1 #define VERSION_MIN 5 -#define VERSION_REV 2 +#define VERSION_REV 3 #define VERSION_UPD 0 #ifndef STR