Fix error message on dll load error.

polygraphene · Jun 27, 2018 · f39e7d3 · f39e7d3
1 parent 8c5c70f
commit f39e7d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/ALVR/Launcher.cs b/ALVR/Launcher.cs
@@ -46,10 +46,18 @@ private void Launcher_Load(object sender, EventArgs e)
             // Get sound devices
             //
 
-            var list = SoundDevice.GetSoundDeviceList();
-            foreach (var device in list)
+            try
             {
-                soundDeviceComboBox.Items.Add(device);
+                var list = SoundDevice.GetSoundDeviceList();
+                foreach (var device in list)
+                {
+                    soundDeviceComboBox.Items.Add(device);
+                }
+            }
+            catch (Exception e2)
+            {
+                Application.Exit();
+                return;
             }
 
             //

diff --git a/ALVR/SoundDevice.cs b/ALVR/SoundDevice.cs
@@ -35,7 +35,7 @@ static public List<string> GetSoundDeviceList()
             if (pDll == IntPtr.Zero)
             {
                 int err = Marshal.GetLastWin32Error();
-                MessageBox.Show("Cannot load library. ALVR works only on 64bits Windows.\r\n" + Utils.GetDllPath(Utils.GetDriverPath()) + "\r\nCode:" + err);
+                MessageBox.Show("Cannot load library. ALVR works only on 64bits Windows with NVIDIA GPU.\r\n" + Utils.GetDllPath(Utils.GetDriverPath()) + "\r\nCode:" + err);
                 throw new Exception();
             }