1 files changed, 14 insertions, 4 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 492bed92..ece52782 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -216,8 +216,6 @@ BOOL APIENTRY DllMain(HANDLE hModule,DWORD ul_reason_for_call,LPVOID lpReserved)
             if(!init_done)
                 break;
             ReleaseALC();
-            ReleaseALEffects();
-            ReleaseALFilters();
             FreeALConfig();
             ALTHUNK_EXIT();
             DeleteCriticalSection(&g_csMutex);
@@ -235,8 +233,6 @@ static void my_deinit()
     once = AL_TRUE;
 
     ReleaseALC();
-    ReleaseALEffects();
-    ReleaseALFilters();
     FreeALConfig();
     ALTHUNK_EXIT();
     DeleteCriticalSection(&g_csMutex);
@@ -1376,6 +1372,20 @@ ALCAPI ALCboolean ALCAPIENTRY alcCloseDevice(ALCdevice *pDevice)
 #endif
             ReleaseALBuffers(pDevice);
         }
+        if(pDevice->EffectCount > 0)
+        {
+#ifdef _DEBUG
+            AL_PRINT("alcCloseDevice(): deleting %d Effect(s)\n", pDevice->EffectCount);
+#endif
+            ReleaseALEffects(pDevice);
+        }
+        if(pDevice->FilterCount > 0)
+        {
+#ifdef _DEBUG
+            AL_PRINT("alcCloseDevice(): deleting %d Filter(s)\n", pDevice->FilterCount);
+#endif
+            ReleaseALFilters(pDevice);
+        }
 
         //Release device structure
         memset(pDevice, 0, sizeof(ALCdevice));