From 7270abe8d395e6454893e6cfe1522bf0a1ca0468 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 6 Aug 2004 16:47:19 +0000
Subject: [PATCH] close installer on WM_QUERYENDSESSION instead of trying to
 clean up on WM_ENDSESSION which doesn't work if there's an active plug-in
 (for example, when the finish page is showing)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3596 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/exehead/Ui.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c
index 4590bea9..fb100512 100644
--- a/Source/exehead/Ui.c
+++ b/Source/exehead/Ui.c
@@ -577,7 +577,7 @@ skipPage:
     m_curwnd = (HWND)wParam;
     goto skipPage;
   }
-  if (uMsg == WM_CLOSE && m_page == g_blocks[NB_PAGES].num - 1)
+  if (uMsg == WM_QUERYENDSESSION || (uMsg == WM_CLOSE && m_page == g_blocks[NB_PAGES].num - 1))
   {
     if (!IsWindowEnabled(m_hwndCancel))
     {
@@ -632,11 +632,6 @@ skipPage:
       SendMessage(m_curwnd, WM_COMMAND, wParam, lParam);
     }
   }
-  if (uMsg == WM_ENDSESSION && wParam)
-  {
-    // the session can end any time after we process this message so we better clean up now
-    CleanUp();
-  }
   return HandleStaticBkColor();
 }