Makes the tray icon always uses the main thread to interact with UI. …

…See #41
Belphemur · Dec 18, 2015 · 83fa139 · 83fa139
1 parent 7838d5c
commit 83fa139
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/SoundSwitch/Util/TrayIcon.cs b/SoundSwitch/Util/TrayIcon.cs
@@ -34,8 +34,7 @@ public sealed class TrayIcon : IDisposable
     {
         private readonly ContextMenuStrip _selectionMenu = new ContextMenuStrip();
         private readonly ContextMenuStrip _settingsMenu = new ContextMenuStrip();
-        private SynchronizationContext _context = SynchronizationContext.Current ?? new SynchronizationContext();
-
+        private readonly SynchronizationContext _context = SynchronizationContext.Current ?? new SynchronizationContext();
         private readonly NotifyIcon _trayIcon = new NotifyIcon
         {
             Icon = Icon.FromHandle(Resources.SoundSwitch16.GetHicon()),
@@ -129,10 +128,10 @@ private void SetEventHandlers()
                     switch (audioDeviceType)
                     {
                         case AudioDeviceType.Playback:
-                            ShowPlaybackChanged(audioChangeEvent.device.FriendlyName);
+                            _context.Send(s => { ShowPlaybackChanged(audioChangeEvent.device.FriendlyName); }, null);
                             break;
                         case AudioDeviceType.Recording:
-                            ShowRecordingChanged(audioChangeEvent.device.FriendlyName);
+                            _context.Send(s => { ShowRecordingChanged(audioChangeEvent.device.FriendlyName); }, null);
                             break;
                         default:
                             throw new ArgumentOutOfRangeException();
@@ -144,14 +143,7 @@ private void SetEventHandlers()
                 (sender, deviceListChanged) => { _context.Send(s => { UpdateDeviceSelectionList(); }, null); };
             AppModel.Instance.NewVersionReleased += (sender, @event) =>
             {
-                if (_selectionMenu.IsHandleCreated)
-                {
-                    _selectionMenu.Invoke(new Action(() => { NewReleaseAvailable(sender, @event); }));
-                }
-                else
-                {
-                    NewReleaseAvailable(sender, @event);
-                }
+                _context.Send(s => { NewReleaseAvailable(sender, @event); }, null);
             };
 
             AppModel.Instance.DeviceRemoved +=