Fix missing input source in dropdown and update metadata

- Add current input to options if monitor doesn't report it in possible values
- Never hide the currently active input port in config filtering
- Make GetInputSourceName public for reuse
- Update company to MarketAlly, author to David H. Friedel Jr
- Add application icon to exe

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

DellMonitorControl/ConfigWindow.xaml.cs

@@ -34,6 +34,22 @@ public partial class ConfigWindow : Window
         spPorts.Children.Clear();
         _portRows.Clear();
 
+        // Show unsupported message if no ports available
+        if (_availablePorts == null || _availablePorts.Count == 0)
+        {
+            spPorts.Children.Add(new TextBlock
+            {
+                Text = "Unsupported",
+                Foreground = Brushes.Gray,
+                FontSize = 16,
+                FontStyle = FontStyles.Italic,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 40, 0, 40)
+            });
+            return;
+        }
+
         foreach (var port in _availablePorts)
         {
             var existingPortConfig = config.Ports.FirstOrDefault(p => p.VcpValue == port.Value);

DellMonitorControl/DellMonitorControl.csproj

@@ -8,14 +8,16 @@
 		<RootNamespace>DellMonitorControl</RootNamespace>
 		<Product>ControlMyMonitorManagement</Product>
 		<UseWPF>true</UseWPF>
-		<Company>Dang</Company>
-		<Copyright>Copyright © DangWang $([System.DateTime]::Now.ToString(yyyy))</Copyright>
+		<Company>MarketAlly</Company>
+		<Authors>David H. Friedel Jr</Authors>
+		<Copyright>Copyright © MarketAlly $([System.DateTime]::Now.ToString(yyyy))</Copyright>
+		<ApplicationIcon>MonitorIcon.ico</ApplicationIcon>
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<Version>1.0.13</Version>
-		<AssemblyVersion>1.0.13.0</AssemblyVersion>
-		<FileVersion>1.0.13.0</FileVersion>
+		<Version>1.0.18</Version>
+		<AssemblyVersion>1.0.18.0</AssemblyVersion>
+		<FileVersion>1.0.18.0</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

DellMonitorControl/MainWindow.xaml.cs

@@ -181,6 +181,15 @@ public partial class MainWindow : Window
                     var inputOptions = await CMMCommand.GetInputSourceOptions(m.SerialNumber);
                     DebugLogger.Log($"  Input options count: {inputOptions.Count}");
 
+                    // Some monitors don't report current input in their possible values list
+                    // Add it if missing so user can see what's currently selected
+                    if (inputSource.HasValue && !inputOptions.Any(o => o.Value == inputSource.Value))
+                    {
+                        var currentInputName = CMMCommand.GetInputSourceName(inputSource.Value);
+                        inputOptions.Insert(0, new InputSourceOption(inputSource.Value, currentInputName));
+                        DebugLogger.Log($"  Added missing current input: {inputSource.Value} ({currentInputName})");
+                    }
+
                     DebugLogger.Log($"  Getting power status...");
                     var powerStatus = await CMMCommand.GetMonPowerStatus(m.SerialNumber) ?? "Unknown";
                     DebugLogger.Log($"  Power status: {powerStatus}");
@@ -188,7 +197,8 @@ public partial class MainWindow : Window
                     _loadedMonitors.Add((m, inputOptions));
 
                     // Apply config to filter hidden ports and use custom labels
-                    var filteredOptions = MonitorConfigManager.ApplyConfigToOptions(m.SerialNumber, inputOptions);
+                    // Pass currentInput so we never hide the currently active port
+                    var filteredOptions = MonitorConfigManager.ApplyConfigToOptions(m.SerialNumber, inputOptions, inputSource);
                     DebugLogger.Log($"  Filtered options count: {filteredOptions.Count}");
 
                     // Monitor name header with Config button
@@ -371,6 +381,10 @@ public partial class MainWindow : Window
 
     private StackPanel CreateInputRow(int? currentInput, List<InputSourceOption> options, string serialNumber)
     {
+        DebugLogger.Log($"  CreateInputRow: currentInput={currentInput}, optionCount={options.Count}");
+        foreach (var opt in options)
+            DebugLogger.Log($"    Option: Value={opt.Value}, Name={opt.Name}");
+
         var row = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 3, 0, 3) };
         row.Children.Add(new TextBlock { Text = "Input", Foreground = Brushes.LightGray, Width = 70, FontSize = 12, VerticalAlignment = VerticalAlignment.Center });
 
@@ -390,9 +404,14 @@ public partial class MainWindow : Window
         if (currentInput.HasValue)
         {
             var index = options.FindIndex(o => o.Value == currentInput.Value);
+            DebugLogger.Log($"    Selection: Looking for Value={currentInput.Value}, found at index={index}");
             if (index >= 0)
                 combo.SelectedIndex = index;
         }
+        else
+        {
+            DebugLogger.Log($"    Selection: currentInput is null, no selection");
+        }
 
         // Add event handler AFTER setting the initial selection
         combo.SelectionChanged += async (s, e) =>
@@ -410,26 +429,33 @@ public partial class MainWindow : Window
         var row = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 3, 0, 3) };
         row.Children.Add(new TextBlock { Text = "Power", Foreground = Brushes.LightGray, Width = 70, FontSize = 12, VerticalAlignment = VerticalAlignment.Center });
 
+        var isUnsupported = string.IsNullOrEmpty(status) || status == "Unknown";
+
         var btn = new Button
         {
-            Content = status,
+            Content = isUnsupported ? "Power Unsupported" : status,
             Width = 170,
             Tag = serialNumber,
-            Style = (Style)FindResource("DarkButton")
+            Style = (Style)FindResource("DarkButton"),
+            IsEnabled = !isUnsupported
         };
-        btn.Click += async (s, e) =>
+
+        if (!isUnsupported)
         {
-            if (s is Button b && b.Tag is string sn)
+            btn.Click += async (s, e) =>
             {
-                var current = await CMMCommand.GetMonPowerStatus(sn);
-                if (current == "Sleep" || current == "PowerOff")
-                    await CMMCommand.PowerOn(sn);
-                else
-                    await CMMCommand.Sleep(sn);
-                await Task.Delay(1000);
-                b.Content = await CMMCommand.GetMonPowerStatus(sn);
-            }
-        };
+                if (s is Button b && b.Tag is string sn)
+                {
+                    var current = await CMMCommand.GetMonPowerStatus(sn);
+                    if (current == "Sleep" || current == "PowerOff")
+                        await CMMCommand.PowerOn(sn);
+                    else
+                        await CMMCommand.Sleep(sn);
+                    await Task.Delay(1000);
+                    b.Content = await CMMCommand.GetMonPowerStatus(sn);
+                }
+            };
+        }
 
         row.Children.Add(btn);
         return row;

Library/Config/MonitorConfigManager.cs

@@ -86,7 +86,8 @@ public static class MonitorConfigManager
 
     public static List<InputSourceOption> ApplyConfigToOptions(
         string serialNumber,
-        List<InputSourceOption> options)
+        List<InputSourceOption> options,
+        int? currentInput = null)
     {
         var monitorConfig = GetMonitorConfig(serialNumber);
 
@@ -101,8 +102,11 @@ public static class MonitorConfigManager
 
             if (portConfig != null)
             {
-                // Respect hidden setting - don't show hidden ports
-                if (portConfig.IsHidden)
+                // Never hide the currently active input - user needs to see what's selected
+                bool isCurrentInput = currentInput.HasValue && option.Value == currentInput.Value;
+
+                // Respect hidden setting - don't show hidden ports (unless it's the current input)
+                if (portConfig.IsHidden && !isCurrentInput)
                     continue;
 
                 if (!string.IsNullOrWhiteSpace(portConfig.CustomLabel))

Library/Helpers/ConsoleHelper.cs

@@ -28,18 +28,17 @@ internal class ConsoleHelper
         p.StartInfo.FileName = command;
         p.Start();
 
-        using var cts = new CancellationTokenSource(timeoutMs);
-        try
+        var readTask = p.StandardOutput.ReadToEndAsync();
+        var completedTask = await Task.WhenAny(readTask, Task.Delay(timeoutMs));
+
+        if (completedTask != readTask)
         {
-            var output = await p.StandardOutput.ReadToEndAsync(cts.Token);
-            await p.WaitForExitAsync(cts.Token);
-            return output;
-        }
-        catch (OperationCanceledException)
-        {
-            try { p.Kill(); } catch { }
+            // Timeout - kill the process
+            try { p.Kill(true); } catch { }
             return string.Empty;
         }
+
+        return await readTask;
     }
 
     public static async Task<string> CmdCommandAsync(params string[] cmds) =>
@@ -63,23 +62,28 @@ internal class ConsoleHelper
         }
         p.StandardInput.WriteLine("exit");
 
-        using var cts = new CancellationTokenSource(timeoutMs);
-        try
+        var readTask = Task.Run(async () =>
         {
-            var result = await p.StandardOutput.ReadToEndAsync(cts.Token);
-            var error = await p.StandardError.ReadToEndAsync(cts.Token);
+            var result = await p.StandardOutput.ReadToEndAsync();
+            var error = await p.StandardError.ReadToEndAsync();
             if (!string.IsNullOrWhiteSpace(error))
                 result = result + "\r\n<Error Message>:\r\n" + error;
-            await p.WaitForExitAsync(cts.Token);
-            p.Close();
-            Debug.WriteLine(result);
             return result;
-        }
-        catch (OperationCanceledException)
+        });
+
+        var completedTask = await Task.WhenAny(readTask, Task.Delay(timeoutMs));
+
+        if (completedTask != readTask)
         {
-            try { p.Kill(); } catch { }
+            // Timeout - kill the process
+            try { p.Kill(true); } catch { }
             return string.Empty;
         }
+
+        var output = await readTask;
+        p.Close();
+        Debug.WriteLine(output);
+        return output;
     }
 
     public static string Command(string fileName, params string[] cmds)

Library/Method/CMMCommand.cs

@@ -30,26 +30,32 @@ public static class CMMCommand
         return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} D6 4");
     }
 
-    private static async Task<string> GetMonitorValue(string monitorSN, string vcpCode = "D6", int? reTry = 0)
+    private static async Task<string> GetMonitorValue(string monitorSN, string vcpCode = "D6", int maxRetries = 2)
     {
-        var value = string.Empty;
-        while (reTry <= 5)
+        for (int attempt = 0; attempt <= maxRetries; attempt++)
         {
             var cmdFileName = Path.Combine(CMMTmpFolder, $"{Guid.NewGuid()}.bat");
             var cmd = $"{CMMexe} /GetValue {monitorSN} {vcpCode}\r\n" +
                       $"echo %errorlevel%";
             File.WriteAllText(cmdFileName, cmd);
             var values = await ConsoleHelper.ExecuteCommand(cmdFileName);
-            File.Delete(cmdFileName);
+            try { File.Delete(cmdFileName); } catch { }
 
-            value = values.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+            // Empty result means timeout - don't retry, monitor is unresponsive
+            if (string.IsNullOrEmpty(values))
+                return string.Empty;
 
-            if (!string.IsNullOrEmpty(value) && value != "0") return value;
-            await Task.Delay(500);
-            await GetMonitorValue(monitorSN, vcpCode, reTry++);
-        };
+            var value = values.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
 
-        return value;
+            if (!string.IsNullOrEmpty(value) && value != "0")
+                return value;
+
+            // Only retry on non-timeout failures
+            if (attempt < maxRetries)
+                await Task.Delay(300);
+        }
+
+        return string.Empty;
     }
 
     #region Brightness (VCP Code 10)
@@ -124,7 +130,7 @@ public static class CMMCommand
         return options;
     }
 
-    private static string GetInputSourceName(int vcpValue)
+    public static string GetInputSourceName(int vcpValue)
     {
         return vcpValue switch
         {