From c9accd6c4fc6a502f05f034110cae896da3b2a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Wed, 16 Nov 2022 12:49:35 +0100
Subject: [PATCH] Fix small bug in a selection when nothing was selected before

---
 PowerControl/Menu.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/PowerControl/Menu.cs b/PowerControl/Menu.cs
index 156bb3e..f1fe30a 100644
--- a/PowerControl/Menu.cs
+++ b/PowerControl/Menu.cs
@@ -157,8 +157,10 @@ namespace PowerControl
             {
                 if (ApplyValue != null)
                     ActiveOption = ApplyValue(SelectedOption);
+                else
+                    ActiveOption = SelectedOption;
 
-                SelectedOption = ActiveOption;
+                SelectedOption = null;
 
                 onUpdateToolStrip();
             }
@@ -207,7 +209,7 @@ namespace PowerControl
 
             public override void SelectNext()
             {
-                int index = Options.IndexOf(SelectedOption);
+                int index = Options.IndexOf(SelectedOption ?? ActiveOption);
                 if (index >= 0)
                     SelectedOption = Options[Math.Min(index + 1, Options.Count - 1)];
                 else
@@ -218,7 +220,7 @@ namespace PowerControl
 
             public override void SelectPrev()
             {
-                int index = Options.IndexOf(SelectedOption);
+                int index = Options.IndexOf(SelectedOption ?? ActiveOption);
                 if (index >= 0)
                     SelectedOption = Options[Math.Max(index - 1, 0)];
                 else