Add files via upload

Fixed an issue with setting confidence before selecting model crashes program, forgot to upload update changes so included UserController updates.
Babyhamsta · Oct 28, 2023 · 232de37 · 232de37
1 parent 4e01b58
commit 232de37
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/AimmyWPF/MainWindow.xaml.cs b/AimmyWPF/MainWindow.xaml.cs
@@ -630,9 +630,21 @@ void LoadSettingsMenu()
             AIMinimumConfidence.Slider.TickFrequency = 1;
             AIMinimumConfidence.Slider.ValueChanged += (s, x) =>
             {
-                double ConfVal = ((double)AIMinimumConfidence.Slider.Value);
-                aimmySettings["AI_Min_Conf"] = ConfVal;
-                _onnxModel.ConfidenceThreshold = (float)(ConfVal / 100.0f);
+                if (lastLoadedModel != "N/A")
+                {
+                    double ConfVal = ((double)AIMinimumConfidence.Slider.Value);
+                    aimmySettings["AI_Min_Conf"] = ConfVal;
+                    _onnxModel.ConfidenceThreshold = (float)(ConfVal / 100.0f);
+                }
+                else 
+                {
+                    // Prevent double messageboxes..
+                    if (AIMinimumConfidence.Slider.Value != aimmySettings["AI_Min_Conf"])
+                    {
+                        System.Windows.MessageBox.Show("Unable to set confidence, please select a model and try again.");
+                        AIMinimumConfidence.Slider.Value = aimmySettings["AI_Min_Conf"];
+                    }
+                }
             };
 
             SettingsScroller.Children.Add(AIMinimumConfidence);

diff --git a/AimmyWPF/UserController/AInfoSection.xaml b/AimmyWPF/UserController/AInfoSection.xaml
@@ -33,7 +33,7 @@
                        VerticalAlignment="Top" />
                 <Label x:Name="Notice"
                        Foreground="White"
-                       Content="Aimmy is, and will never be for sale."
+                       Content="Aimmy is free, and will never be for sale."
                        FontFamily="/AimmyWPF;component/Fonts/#Atkinson Hyperlegible"
                        VerticalContentAlignment="Center"
                        Padding="5,0,0,0"
@@ -68,7 +68,7 @@
                        RenderTransformOrigin="0.602,0.353" />
                 <Label x:Name="Credit"
                        Foreground="White"
-                       Content="By BabyHamsta &amp; Nori"
+                       Content="By Babyhamsta &amp; Nori"
                        FontFamily="/AimmyWPF;component/Fonts/#Atkinson Hyperlegible"
                        VerticalContentAlignment="Center"
                        Padding="0,0,0,0"
@@ -91,7 +91,7 @@
                         materialDesign:ButtonAssist.CornerRadius="5" />
                 <Label x:Name="VersionNumber"
                        Foreground="White"
-                       Content="1.0.0"
+                       Content="1.1.1"
                        VerticalContentAlignment="Center"
                        Padding="5,0,0,0"
                        FontSize="20"