Merge pull request #186 from thefiddler/al_notfound_fix

[AL] Fix runtime crash when OpenAL not available
2014-09-30 13:53:11 +02:00 · 2014-09-30 13:53:11 +02:00 · 9a37b72002
commit 9a37b72002
parent e06fc9fb0a 9851a3bab9
1 changed files with 16 additions and 6 deletions
--- a/Source/OpenTK/Audio/AudioDeviceEnumerator.cs
+++ b/Source/OpenTK/Audio/AudioDeviceEnumerator.cs
@ -204,6 +204,10 @@ namespace OpenTK.Audio
            {
                Debug.Unindent();

+                if (openal_supported)
+                {
+                    try
+                    {
                        // clean up the dummy context
                        Alc.MakeContextCurrent(ContextHandle.Zero);
                        if (dummy_context != ContextHandle.Zero && dummy_context.Handle != IntPtr.Zero)
@ -211,6 +215,12 @@ namespace OpenTK.Audio
                        if (dummy_device != IntPtr.Zero)
                            Alc.CloseDevice(dummy_device);
                    }
+                    catch
+                    {
+                        openal_supported = false;
+                    }
+                }
+            }
        }

        #endregion