Merge branch 'master' into release

leezer3 · Jan 5, 2019 · 2e7b29a · 2e7b29a
2 parents f163d7e + 9b2277a
commit 2e7b29a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/WindowsInstaller.ps1 b/WindowsInstaller.ps1
@@ -292,4 +292,5 @@ begin
 end;
 "@ 
 
-$InstallerOut | Out-File -FilePath installers\windows\openbve.iss -Encoding UTF8
+$InstallerOut | Out-File -FilePath $PSScriptRoot\installers\windows\openbve.iss -Encoding UTF8
+& "C:\Program Files (x86)\Inno Setup 5\compil32.exe" /cc $PSScriptRoot\installers\windows\openbve.iss
diff --git a/source/OpenBVE/Audio/Sounds.cs b/source/OpenBVE/Audio/Sounds.cs
@@ -101,7 +101,14 @@ internal static void Initialize()
 			OuterRadiusFactor = Math.Sqrt(OuterRadiusFactorMinimum * OuterRadiusFactorMaximum);
 			OuterRadiusFactorSpeed = 0.0;
 			OpenAlDevice = Alc.OpenDevice(null);
-			OpenAlMic = new AudioCapture(AudioCapture.DefaultDevice, SamplingRate, ALFormat.Mono16, BufferSize);
+			try
+			{
+				OpenAlMic = new AudioCapture(AudioCapture.DefaultDevice, SamplingRate, ALFormat.Mono16, BufferSize);
+			}
+			catch
+			{
+			}
+
 			if (OpenAlDevice != IntPtr.Zero)
 			{
 				OpenAlContext = Alc.CreateContext(OpenAlDevice, (int[])null);