From bea4a7059abefc4b67b5bb67fc4bd53609b06ea7 Mon Sep 17 00:00:00 2001
From: MikalaiR <nikolay.romanovich@narod.ru>
Date: Mon, 22 Feb 2016 17:24:49 +0000
Subject: BASS_Interface: crash fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@16324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/BASS_interface/src/Main.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp
index cb5d7cbea9..4ca3209655 100644
--- a/plugins/BASS_interface/src/Main.cpp
+++ b/plugins/BASS_interface/src/Main.cpp
@@ -18,8 +18,8 @@ static HINSTANCE hBass = NULL;
 
 FARPROC WINAPI delayHook(unsigned dliNotify, PDelayLoadInfo)
 {
-	if (dliNotify == dliNotePreLoadLibrary)
-		return (FARPROC)hBass;
+	//if (dliNotify == dliNotePreLoadLibrary)
+	//	return (FARPROC)hBass;
 	return NULL;
 }
 
@@ -520,10 +520,6 @@ void LoadBassLibrary(const TCHAR *ptszPath)
 		hPlaySound = HookEvent(ME_SKIN_PLAYINGSOUND, OnPlaySnd);
 		CreateFrame();
 	}
-	else {
-		FreeLibrary(hBass);
-		hBass = NULL;
-	}
 }
 
 int OnFoldersChanged(WPARAM, LPARAM)
@@ -534,6 +530,7 @@ int OnFoldersChanged(WPARAM, LPARAM)
 	if (hBass != NULL) {
 		BASS_Free();
 		FreeLibrary(hBass);
+		hBass = NULL;
 		UnhookEvent(hPlaySound);
 		DeleteFrame();
 	}
-- 
cgit v1.2.3