From 7a07e38f4fc8998696969d0734815299ad2b1146 Mon Sep 17 00:00:00 2001
From: donho <donho@f5eea248-9336-0410-98b8-ebc06183d4e3>
Date: Sun, 30 Mar 2008 23:46:07 +0000
Subject: [PATCH] [BUG_FIXED] Fix a crash bug by inserting a new feature.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@158 f5eea248-9336-0410-98b8-ebc06183d4e3
---
 PowerEditor/installer/nppSetup.nsi                |  8 +++++---
 .../src/WinControls/DockingWnd/DockingManager.cpp | 15 ++++++++-------
 PowerEditor/src/resource.h                        |  6 +++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index e051b20d..88c1108d 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -17,16 +17,16 @@
 
 ; Define the application name
 !define APPNAME "Notepad++"
-!define APPNAMEANDVERSION "Notepad++ v4.8.2"
+!define APPNAMEANDVERSION "Notepad++ v4.8.5"
 
 !define VERSION_MAJOR 4
-!define VERSION_MINOR 82
+!define VERSION_MINOR 85
 
 ; Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDir "$PROGRAMFILES\Notepad++"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "..\bin\npp.4.8.2.Installer.exe"
+OutFile "..\bin\npp.4.8.5.Installer.exe"
 
 ; GetWindowsVersion
  ;
@@ -468,7 +468,9 @@ GLOBAL_INST:
 	CreateShortCut "$SMPROGRAMS\Notepad++\Uninstall.lnk" "$INSTDIR\uninstall.exe"
 	
 	; remove unstable plugins
+	Delete "$INSTDIR\plugins\HexEditorPlugin.dll"
 	Delete "$INSTDIR\plugins\HexEditor.dll"
+	Delete "$INSTDIR\plugins\MultiClipboard.dll"
 	
 	; detect the right of 
 	UserInfo::GetAccountType
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
index 61a9c9bd..502ffd15 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
@@ -199,6 +199,13 @@ LRESULT DockingManager::runProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 		}
 		case WM_DESTROY:
 		{
+			/* unregister window event hooking BEFORE EVERYTHING ELSE */
+			if (hWndServer == hwnd) {
+				UnhookWindowsHookEx(gWinCallHook);
+				gWinCallHook = NULL;
+				hWndServer = NULL;
+			}
+
 			/* destroy imagelist if it exists */
 			if (_hImageList != NULL)
 			{
@@ -211,13 +218,6 @@ LRESULT DockingManager::runProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 				_vContainer[i-1]->destroy();
 				delete _vContainer[i-1];
 			}
-
-			/* unregister window event hooking */
-			if (hWndServer == hwnd) {
-				UnhookWindowsHookEx(gWinCallHook);
-				gWinCallHook = NULL;
-				hWndServer = NULL;
-			}
 			CoUninitialize();
 			break;
 		}
@@ -870,3 +870,4 @@ int DockingManager::FindEmptyContainer(void)
     return iRetCont; 
 }
 
+
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 6fc5cac7..26aa2ccd 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -18,9 +18,9 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION	"Notepad++ v4.8.2"
-#define VERSION_VALUE "4.82\0"  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
-#define VERSION_DIGITALVALUE 4, 8, 2, 0
+#define NOTEPAD_PLUS_VERSION	"Notepad++ v4.8.5"
+#define VERSION_VALUE "4.85\0"  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
+#define VERSION_DIGITALVALUE 4, 8, 5, 0
 
 #ifndef IDC_STATIC
 #define IDC_STATIC	-1