epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NREs in QueryDevices by bailing out early.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-04-24 20:49:24 +02:00
parent 149271f71e
commit e47383a4fa
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Platforms.Default/OpenAlSoundEngine.cs
View File

@@ -56,6 +56,12 @@ namespace OpenRA.Platforms.Default
var devices = new List<string>(); var devices = new List<string>();
var next = ALC10.alcGetString(IntPtr.Zero, type); var next = ALC10.alcGetString(IntPtr.Zero, type);
if (next == IntPtr.Zero || AL10.alGetError() != AL10.AL_NO_ERROR)
{
Log.Write("sound", "Failed to query OpenAL device list using {0}", label);
return new string[] { };
}
do do
{ {
var str = Marshal.PtrToStringAnsi(next); var str = Marshal.PtrToStringAnsi(next);
@@ -63,12 +69,6 @@ namespace OpenRA.Platforms.Default
devices.Add(str); devices.Add(str);
} while (Marshal.ReadByte(next) != 0); } while (Marshal.ReadByte(next) != 0);
if (AL10.alGetError() != AL10.AL_NO_ERROR)
{
Log.Write("sound", "Failed to query OpenAL device list using {0}", label);
return new string[] { };
}
return devices.ToArray(); return devices.ToArray();
} }