From 960a20dcd916e05fde9fb67cd42ad7f75f85a1f9 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 2 Mar 2017 00:16:52 +0300
Subject: fix for options dialog that isn't deleted after closing options

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

(limited to 'src')

diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index b4c3af064c..1514647c0b 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -185,9 +185,8 @@ public:
 			lParam = m_lParam;
 
 		LRESULT res = m_wndProc(m_hwnd, msg, wParam, lParam);
-
-		if (msg == WM_DESTROY)
-			m_hwnd = NULL;
+		if (!res)
+			res = CDlgBase::DlgProc(msg, wParam, lParam);
 
 		return res;
 	}
@@ -227,8 +226,6 @@ struct OptionsPageData : public MZeroedObject
 	
 	~OptionsPageData()
 	{
-		if (pDialog && getHwnd() != NULL)
-			DestroyWindow(getHwnd());
 	}
 
 	CDlgBase *pDialog;
-- 
cgit v1.2.3