It's possible the list of device is uninitialised

Fixes #481
Belphemur · Jul 26, 2020 · ec26022 · ec26022
1 parent 8781a69
commit ec26022
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/SoundSwitch/Framework/TrayIcon/TooltipInfoManager/TootipInfo/TooltipInfoPlayback.cs b/SoundSwitch/Framework/TrayIcon/TooltipInfoManager/TootipInfo/TooltipInfoPlayback.cs
@@ -31,7 +31,11 @@ public class TooltipInfoPlayback : ITooltipInfo
         /// <returns></returns>
         public string TextToDisplay()
         {
-            var audioDevices = AppModel.Instance.ActiveAudioDeviceLister.PlaybackDevices;
+            var audioDevices = AppModel.Instance.ActiveAudioDeviceLister?.PlaybackDevices;
+            if (audioDevices == null)
+            {
+                return string.Format(SettingsStrings.activePlayback, "Unknown");
+            }
 
             var playbackDefaultDevice = audioDevices
                 .FirstOrDefault(device =>

diff --git a/SoundSwitch/Framework/TrayIcon/TooltipInfoManager/TootipInfo/TooltipInfoRecording.cs b/SoundSwitch/Framework/TrayIcon/TooltipInfoManager/TootipInfo/TooltipInfoRecording.cs
@@ -23,16 +23,22 @@ namespace SoundSwitch.Framework.TrayIcon.TooltipInfoManager.TootipInfo
     public class TooltipInfoRecording : ITooltipInfo
     {
         public TooltipInfoTypeEnum TypeEnum => TooltipInfoTypeEnum.Recording;
-        public string Label => SettingsStrings.tooltipOnHoverOptionRecordingDevice;
+        public string              Label    => SettingsStrings.tooltipOnHoverOptionRecordingDevice;
 
         /// <summary>
         /// The text to display for this ToolTip
         /// </summary>
         /// <returns></returns>
         public string TextToDisplay()
         {
-            var recordingDevice = AppModel.Instance.ActiveAudioDeviceLister.RecordingDevices.FirstOrDefault(device =>
-                AudioSwitcher.Instance.IsDefault(device.Id, (EDataFlow)device.Type, ERole.eConsole));
+            var recordingDevices = AppModel.Instance.ActiveAudioDeviceLister?.RecordingDevices;
+            if (recordingDevices == null)
+            {
+                return string.Format(SettingsStrings.activeRecording, "Unknown");
+            }
+
+            var recordingDevice = recordingDevices?.FirstOrDefault(device =>
+                AudioSwitcher.Instance.IsDefault(device.Id, (EDataFlow) device.Type, ERole.eConsole));
             return recordingDevice == null ? null : string.Format(SettingsStrings.activeRecording, recordingDevice);
         }