From c9c62efe5f07d16d98f74755d1f6c20fe3e60310 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 24 Apr 2024 20:48:05 +0300
Subject: =?UTF-8?q?fixes=20#4378=20(=D0=9F=D0=B0=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B5=20=D0=B2=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B2=D1=8B=D0=B3=D1=80?=
 =?UTF-8?q?=D1=83=D0=B7=D0=BA=D0=B8=20Scriver)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/options.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index 4599eb44b3..e92e94ec80 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -1089,6 +1089,7 @@ public:
 			delete it;
 			m_arOpd.remove(idx);
 		}
+		m_arDeleted.destroy();
 
 		RebuildPageTree();
 	}
@@ -1114,15 +1115,16 @@ public:
 	void DynamicAddPage(OptionsPage *pPage)
 	{
 		OptionsPageData *opd = new OptionsPageData(*pPage);
-		if (opd->pDialog == nullptr) // smth went wrong
+		if (opd->pDialog == nullptr) { // smth went wrong
 			delete opd;
-		else {
-			if (m_bInsideApply)
-				m_arInserted.insert(opd);
-			else
-				m_arOpd.insert(opd);
-			m_timerRebuild.Start(50);
+			return;
 		}
+
+		if (m_bInsideApply)
+			m_arInserted.insert(opd);
+		else
+			m_arOpd.insert(opd);
+		m_timerRebuild.Start(50);
 	}
 
 	void KillAccount(PROTO_INTERFACE *ppro)
-- 
cgit v1.2.3