Fix exception throw (#28104)

* fix exception throw * fix settings crash * throw runtime_error
microsoft · Aug 24, 2023 · 738072f · 738072f
1 parent 8314316
commit 738072f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/modules/MouseUtils/FindMyMouse/dllmain.cpp b/src/modules/MouseUtils/FindMyMouse/dllmain.cpp
@@ -192,7 +192,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             }
             else
             {
-                throw;
+                throw std::runtime_error("Invalid Activation Method value");
             }
 
         }
@@ -258,7 +258,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             }
             else
             {
-                throw;
+                throw std::runtime_error("Invalid Overlay Opacity value");
             }
         }
         catch (...)
@@ -276,7 +276,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             }
             else
             {
-                throw;
+                throw std::runtime_error("Invalid Spotlight Radius value");
             }
         }
         catch (...)
@@ -294,7 +294,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             }
             else
             {
-                throw;
+                throw std::runtime_error("Invalid Animation Duration value");
             }
         }
         catch (...)
@@ -312,7 +312,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             }
             else
             {
-                throw;
+                throw std::runtime_error("Invalid Spotlight Initial Zoom value");
             }
         }
         catch (...)
@@ -355,7 +355,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             }
             else
             {
-                throw;
+                throw std::runtime_error("Invalid Shaking Minimum Distance value");
             }
         }
         catch (...)

diff --git a/src/modules/MouseUtils/MouseHighlighter/dllmain.cpp b/src/modules/MouseUtils/MouseHighlighter/dllmain.cpp
@@ -238,7 +238,7 @@ class MouseHighlighter : public PowertoyModuleIface
                     }
                     else
                     {
-                        throw;
+                        throw std::runtime_error("Invalid Opacity value");
                     }
                 }
                 catch (...)
@@ -314,7 +314,7 @@ class MouseHighlighter : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Radius value");
                 }
             }
             catch (...)
@@ -332,7 +332,7 @@ class MouseHighlighter : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Fade Delay value");
                 }
             }
             catch (...)
@@ -350,7 +350,7 @@ class MouseHighlighter : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Fade Duration value");
                 }
             }
             catch (...)

diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp b/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp
@@ -233,7 +233,7 @@ class MousePointerCrosshairs : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Opacity value");
                 }
             }
             catch (...)
@@ -270,7 +270,7 @@ class MousePointerCrosshairs : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Radius value");
                 }
 
             }
@@ -289,7 +289,7 @@ class MousePointerCrosshairs : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Thickness value");
                 }
 
             }
@@ -327,7 +327,7 @@ class MousePointerCrosshairs : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Border Color value");
                 }
             }
             catch (...)
@@ -366,7 +366,7 @@ class MousePointerCrosshairs : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Fixed Length value");
                 }
             }
             catch (...)

diff --git a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp
@@ -342,7 +342,7 @@ class ShortcutGuideModule : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Press Time Windows Shortcuts value");
                 }
                 value = static_cast<int>(jsonPressTimeForTaskbarIconShortcutsObject.GetNamedNumber(L"value"));
                 if (value >= 0)
@@ -351,7 +351,7 @@ class ShortcutGuideModule : public PowertoyModuleIface
                 }
                 else
                 {
-                    throw;
+                    throw std::runtime_error("Invalid Press Time Taskbar Shortcuts value");
                 }
             }
             catch (...)

diff --git a/src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs
@@ -48,7 +48,7 @@ public MouseUtilsViewModel(ISettingsUtils settingsUtils, ISettingsRepository<Gen
             }
 
             FindMyMouseSettingsConfig = findMyMouseSettingsRepository.SettingsConfig;
-            _findMyMouseActivationMethod = FindMyMouseSettingsConfig.Properties.ActivationMethod.Value;
+            _findMyMouseActivationMethod = FindMyMouseSettingsConfig.Properties.ActivationMethod.Value < 2 ? FindMyMouseSettingsConfig.Properties.ActivationMethod.Value : 0;
             _findMyMouseDoNotActivateOnGameMode = FindMyMouseSettingsConfig.Properties.DoNotActivateOnGameMode.Value;
 
             string backgroundColor = FindMyMouseSettingsConfig.Properties.BackgroundColor.Value;