summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikalaiR <nikolay.romanovich@narod.ru>2016-02-22 17:24:49 +0000
committerMikalaiR <nikolay.romanovich@narod.ru>2016-02-22 17:24:49 +0000
commitbea4a7059abefc4b67b5bb67fc4bd53609b06ea7 (patch)
tree123a3a5556e47c3494d6aad847825935ffac586b
parent99177f6965456cdccb93b6bafcf476a95ecacd6a (diff)
BASS_Interface: crash fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@16324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/BASS_interface/src/Main.cpp9
1 files changed, 3 insertions, 6 deletions
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();
}