Update submodules

App.xaml.cs

@@ -3,6 +3,7 @@ using Common.IO;
 using Common.Wpf.Extensions;
 using Squirrel;
 using System;
+using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
@@ -35,45 +36,41 @@ namespace WorkIndicator
 
             _dispatcher = Dispatcher.CurrentDispatcher;
 
+            // Create an isolation handle to see if we are already running
+            _isolationHandle = ApplicationIsolation.GetIsolationHandle();
+
+            // If there is another copy then pass it the command line and exit
+            if (_isolationHandle == null)
+            {
+                try
+                {
+                    InterprocessMessageSender.SendMessage(Environment.CommandLine);
+                }
+                catch { }
+
+                Shutdown();
+                return;
+            }
+
+            // Initialize the command line listener
+            _commandLineListener = new InterprocessMessageListener(Assembly.GetEntryAssembly().GetName().Name);
+            _commandLineListener.MessageReceived += HandleCommandLine;
+
             // Initialize the tray icon
             TrayIcon.Initialize();
 
-            Task.Factory.StartNew(CheckUpdate).ContinueWith(task => StartApplication(task.Result.Result));
-        }
+            // Set automatic start into the registry
+            Current.SetStartWithWindows(Settings.Default.StartWithWindows);
 
-        private void StartApplication(bool updateRequired)
-        {
-            if (updateRequired)
-                return;
+            // Initialize the light controller
+            LightController.Initialize();
 
-            Task.Factory.StartNew(() =>
-            {
-                // Create an isolation handle to see if we are already running
-                _isolationHandle = ApplicationIsolation.GetIsolationHandle();
-
-                // If there is another copy then pass it the command line and exit
-                if (_isolationHandle == null)
-                {
-                    InterprocessMessageSender.SendMessage(Environment.CommandLine);
-                    Shutdown();
-                    return;
-                }
-
-                // Initialize the command line listener
-                _commandLineListener = new InterprocessMessageListener(WorkIndicator.Properties.Resources.ApplicationName);
-                _commandLineListener.MessageReceived += HandleCommandLine;
-
-                // Set automatic start into the registry
-                Current.SetStartWithWindows(Settings.Default.StartWithWindows);
-
-                // Initialize the light controller
-                LightController.Initialize();
-            });
+            Task.Factory.StartNew(CheckUpdate);
         }
 
         private void HandleCommandLine(object sender, InterprocessMessageListener.InterprocessMessageEventArgs e)
         {
-            
+
         }
 
         private async Task<bool> CheckUpdate()
@@ -83,10 +80,12 @@ namespace WorkIndicator
 
         private void HandleUpdateStatus(UpdateCheck.UpdateStatus status, string message)
         {
-            if (status != UpdateCheck.UpdateStatus.Downloading)
+            if (status != UpdateCheck.UpdateStatus.Installing)
                 return;
 
             _dispatcher.Invoke(() => TrayIcon.ShowUpdateMessage(message));
+
+            TrayIcon.Dispose();
         }
 
         protected override void OnExit(ExitEventArgs e)
@@ -98,7 +97,7 @@ namespace WorkIndicator
             TrayIcon.Dispose();
 
             // Get rid of the isolation handle
-            _isolationHandle.Dispose();
+            _isolationHandle?.Dispose();
 
             base.OnExit(e);
         }

LightController.cs

@@ -15,11 +15,15 @@ namespace WorkIndicator
     public static class LightController
     {
         private static StoplightIndicator _stoplightIndicator;
+        private static UsbService _usbService;
         private static bool _initialized;
         private static Status _status = Status.Auto;
 
         public static void Initialize()
         {
+            _usbService = new UsbService();
+            _usbService.DevicesChanged += DevicesChanged;
+
             _stoplightIndicator = new StoplightIndicator();
             _stoplightIndicator.SetLight(StoplightIndicator.Light.Yellow, StoplightIndicator.LightState.On);
 
@@ -29,6 +33,14 @@ namespace WorkIndicator
             _initialized = true;
         }
 
+        private static void DevicesChanged()
+        {
+            _stoplightIndicator?.Dispose();
+            _stoplightIndicator = new StoplightIndicator();
+    
+            UpdateLights();
+        }
+
         private static void AudioWatcher_MicrophoneInUseChanged(bool microphoneInUse)
         {
             UpdateLights();
@@ -44,6 +56,8 @@ namespace WorkIndicator
             _stoplightIndicator.SetLights(StoplightIndicator.LightState.Off, StoplightIndicator.LightState.Off, StoplightIndicator.LightState.Off);
             _stoplightIndicator.Dispose();
 
+            _usbService.Dispose();
+
             _initialized = false;
         }
 

TrayIcon.cs

@@ -70,7 +70,7 @@ namespace WorkIndicator
 
         public static void ShowUpdateMessage(string text)
         {
-            _trayIcon.ShowBalloonTip(250, Resources.ApplicationName, text, ToolTipIcon.None);
+            _trayIcon.ShowBalloonTip(200, Resources.ApplicationName, text, ToolTipIcon.None);
         }
 
         static void HandleContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)

UsbService.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Windows.Forms;
+
+namespace WorkIndicator
+{
+    internal class UsbService : NativeWindow, IDisposable
+    {
+        public event Action DevicesChanged;
+
+        private const int WM_DEVICECHANGE = 0x0219;
+        private const int DBT_DEVICEARRIVAL = 0x8000;
+        private const int DBT_DEVICEREMOVECOMPLETE = 0x8004;
+        private const int DBT_DEVNODES_CHANGED = 0x0007;
+
+        private bool _isDisposed;
+
+        internal UsbService()
+        {
+            base.CreateHandle(new CreateParams());
+        }
+
+
+        protected override void WndProc(ref Message msg)
+        {
+            base.WndProc(ref msg);
+
+            if (msg.Msg == WM_DEVICECHANGE)
+            {
+                switch (msg.WParam.ToInt32())
+                {
+                    case DBT_DEVNODES_CHANGED:
+                    case DBT_DEVICEARRIVAL:
+                    case DBT_DEVICEREMOVECOMPLETE:
+                        DevicesChanged?.Invoke();
+                        break;
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                base.DestroyHandle();
+
+                _isDisposed = true;
+
+                GC.SuppressFinalize(this);
+            }
+        }
+    }
+}

WorkIndicator.csproj

@@ -144,6 +144,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="UpdateCheck.cs" />
+    <Compile Include="UsbService.cs" />
     <Page Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>