From c0a854ab6149205a55c724c8ad41b5e949831cc5 Mon Sep 17 00:00:00 2001
From: DavidXanatos <xanatosdavid@gmail.com>
Date: Wed, 26 Oct 2022 12:49:38 +0200
Subject: [PATCH] 1.5.2

---
 CHANGELOG.md                                      |  8 ++++++++
 Sandboxie/common/my_version.h                     |  4 ++--
 SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp  | 12 +++++++-----
 SandboxiePlus/SandMan/Windows/OptionsGrouping.cpp |  5 ++++-
 SandboxiePlus/version.h                           |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ce8f4a0..78534a7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 
+## [1.5.2 / 5.60.2] - 2022-10-??
+
+### Changed
+- uttility groups are now cleaned up automatically
+
+
+
+
 ## [1.5.1 / 5.60.1] - 2022-10-??
 
 ### Added
diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h
index 72d22ca8..a52071ce 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,1
-#define MY_VERSION_STRING       "5.60.1"
+#define MY_VERSION_BINARY       5,60,2
+#define MY_VERSION_STRING       "5.60.2"
 #define MY_ABI_VERSION          0x56000
 
 // These #defines are used by either Resource Compiler or NSIS installer
diff --git a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
index 82e6ba64..d8ec3588 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
@@ -77,11 +77,13 @@ void COptionsWindow::CreateGeneral()
 		}
 	}
 
-	QWidget* ExWidgets[] = { ui.chkSecurityMode, ui.chkLockDown, ui.chkRestrictDevices,
-		ui.chkPrivacy, ui.chkUseSpecificity,
-		ui.chkNoSecurityIsolation, ui.chkNoSecurityFiltering, ui.chkConfidential, NULL };
-	for(QWidget** ExWidget = ExWidgets; *ExWidget != NULL; ExWidget++)
-		COptionsWindow__AddCertIcon(*ExWidget);
+	if (g_Certificate.isEmpty()) {
+		QWidget* ExWidgets[] = { ui.chkSecurityMode, ui.chkLockDown, ui.chkRestrictDevices,
+			ui.chkPrivacy, ui.chkUseSpecificity,
+			ui.chkNoSecurityIsolation, ui.chkNoSecurityFiltering, ui.chkConfidential, ui.chkHostProtect, NULL };
+		for (QWidget** ExWidget = ExWidgets; *ExWidget != NULL; ExWidget++)
+			COptionsWindow__AddCertIcon(*ExWidget);
+	}
 
 
 	m_HoldBoxType = false;
diff --git a/SandboxiePlus/SandMan/Windows/OptionsGrouping.cpp b/SandboxiePlus/SandMan/Windows/OptionsGrouping.cpp
index cd3a2764..17c5e299 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsGrouping.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsGrouping.cpp
@@ -173,7 +173,8 @@ void COptionsWindow::AddProgramToGroup(const QString& Program, const QString& Gr
 
 bool COptionsWindow::DelProgramFromGroup(const QString& Program, const QString& Group)
 {
-	QTreeWidgetItem* pItem = FindGroupByName(Group, true);
+	QTreeWidgetItem* pItem = FindGroupByName(Group, false);
+	if (!pItem) return false;
 
 	bool bFound = false;
 	for (int j = 0; j < pItem->childCount(); j++){
@@ -181,6 +182,8 @@ bool COptionsWindow::DelProgramFromGroup(const QString& Program, const QString&
 		if (pProgItem->data(0, Qt::UserRole).toString().compare(Program, Qt::CaseInsensitive) == 0)  {
 			delete pProgItem;
 			bFound = true;
+			if (pItem->childCount() == 0)
+				delete pItem;
 			break;
 		}
 	}
diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h
index ee3edf10..7c7c21da 100644
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@@ -2,7 +2,7 @@
 
 #define VERSION_MJR		1
 #define VERSION_MIN 	5
-#define VERSION_REV 	1
+#define VERSION_REV 	2
 #define VERSION_UPD 	0
 
 #ifndef STR