- .onVerifyInstDir is now used in the browse dialog too

- Fixed problems with SHFileOperation, OleUninitialize and ICopyHook (and possibly XPlay)


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2947 212acab6-be3b-0410-9dea-997c60f758d6

Source/exehead/Main.c

@@ -223,10 +223,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,LPSTR lpszCmdParam,
 #endif//NSIS_CONFIG_LOG
 end:
 
-#if defined(NSIS_SUPPORT_ACTIVEXREG) || defined(NSIS_SUPPORT_CREATESHORTCUT)
-  OleUninitialize();
-#endif
-
   if (g_db_hFile != INVALID_HANDLE_VALUE) CloseHandle(g_db_hFile);
 #ifdef NSIS_COMPRESS_WHOLE
   if (dbd_hFile != INVALID_HANDLE_VALUE) CloseHandle(dbd_hFile);
@@ -239,5 +235,9 @@ end:
 #endif // NSIS_CONFIG_PLUGIN_SUPPORT
   if (g_hIcon) DeleteObject(g_hIcon);
 
+#if defined(NSIS_SUPPORT_ACTIVEXREG) || defined(NSIS_SUPPORT_CREATESHORTCUT)
+  OleUninitialize();
+#endif
+
   ExitProcess(ret);
-}
+}