v2.8.8

- Fixed the system tray icon not showing after launching the game if that user option is set
H1emu · Nov 12, 2023 · eb86e5d · eb86e5d
1 parent 68aa835
commit eb86e5d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 34 deletions.
diff --git a/H1EmuLauncher/App.xaml b/H1EmuLauncher/App.xaml
@@ -17,10 +17,10 @@
                     <Setter.Value>
                         <ControlTemplate>
                             <Rectangle Margin="2"
-                                   SnapsToDevicePixels="True"
-                                   Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                   StrokeDashArray="1 2"
-                                   StrokeThickness="1"/>
+                                       SnapsToDevicePixels="True"
+                                       Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                       StrokeDashArray="1 2"
+                                       StrokeThickness="1"/>
 
                         </ControlTemplate>
                     </Setter.Value>
@@ -355,27 +355,6 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-            <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
-                <Setter Property="OverridesDefaultStyle" Value="True"/>
-                <Setter Property="AllowDrop" Value="True"/>
-                <Setter Property="MinWidth" Value="0"/>
-                <Setter Property="MinHeight" Value="0"/>
-                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-                <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type TextBox}">
-                            <ScrollViewer
-                            x:Name="PART_ContentHost"
-                            Background="Transparent"
-                            Focusable="False"
-                            HorizontalScrollBarVisibility="Hidden"
-                            VerticalScrollBarVisibility="Hidden"/>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
             <ImageBrush x:Key="NextButton.Static.Background" ImageSource="Resources\NextButton.png"/>
             <SolidColorBrush x:Key="NextButton.Static.Border" Color="Transparent"/>
             <ImageBrush x:Key="NextButton.MouseOver.Background" ImageSource="Resources\NextButton_Hover.png"/>

diff --git a/H1EmuLauncher/H1EmuLauncher.csproj b/H1EmuLauncher/H1EmuLauncher.csproj
@@ -7,18 +7,18 @@
 	  <UseWPF>true</UseWPF>
 	  <UseWindowsForms>true</UseWindowsForms>
 	  <ApplicationIcon>Icon.ico</ApplicationIcon>
-	  <FileVersion>2.8.7</FileVersion>
+	  <FileVersion>2.8.8</FileVersion>
 	  <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 	  <Authors>H1Emu</Authors>
-	  <Version>2.8.7</Version>
+	  <Version>2.8.8</Version>
 	  <AssemblyName>H1EmuLauncher</AssemblyName>
 	  <SignAssembly>false</SignAssembly>
 	  <Copyright>© H1Emu</Copyright>
 	  <Product>H1Emu Launcher</Product>
 	  <Description>A launcher for the H1Emu project.</Description>
 	  <Title>H1Emu Launcher</Title>
 	  <PackageIcon>Icon.ico</PackageIcon>
-	  <AssemblyVersion>2.8.7</AssemblyVersion>
+	  <AssemblyVersion>2.8.8</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/H1EmuLauncher/Windows/LauncherWindow.xaml.cs b/H1EmuLauncher/Windows/LauncherWindow.xaml.cs
@@ -581,15 +581,15 @@ private void LaunchClient(object sender, RoutedEventArgs e)
                                 {
                                     Show();
                                     Activate();
+                                    launcherNotifyIcon.Visible = false;
                                 }));
-                                launcherNotifyIcon.Visible = false;
                             }
                         };
                         h1Process.Start();
 
                         Dispatcher.Invoke(new Action(delegate
                         {
-                            if (serverSelector.SelectedIndex != 0 && serverSelector.SelectedIndex != 1 && serverSelector.SelectedIndex != serverSelector.Items.Count - 1 && serverSelector.SelectedIndex != serverSelector.Items.Count - 2)
+                            if (serverSelector.SelectedIndex != 0 && serverSelector.SelectedIndex != 1 && serverSelector.SelectedIndex != serverSelector.Items.Count - 1 && serverSelector.SelectedItem is ComboBoxItem)
                                 AddServerToRecentList(serverSelector.Text, serverIp);
                         }));
 
@@ -598,8 +598,8 @@ private void LaunchClient(object sender, RoutedEventArgs e)
                             Dispatcher.Invoke(new Action(delegate
                             {
                                 Hide();
+                                launcherNotifyIcon.Visible = true;
                             }));
-                            launcherNotifyIcon.Visible = true;
                             new ToastContentBuilder().AddText(FindResource("item191").ToString()).Show();
                         }
                     }

diff --git a/H1EmuLauncherSetup/H1EmuLauncherSetup.vdproj b/H1EmuLauncherSetup/H1EmuLauncherSetup.vdproj
@@ -203,15 +203,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:H1Emu Launcher"
-        "ProductCode" = "8:{892C5E9C-B177-4E1E-8228-B79E55D9C71D}"
-        "PackageCode" = "8:{2C66DBCE-8FEA-435A-BE1B-49A77E9EF1DC}"
+        "ProductCode" = "8:{28446AF7-4299-4806-8C10-D718B670B66B}"
+        "PackageCode" = "8:{6DD34298-DAD8-4BAC-B7BF-5E5688F4FEC7}"
         "UpgradeCode" = "8:{4E679270-65C8-4021-83BE-3B8EC3EC7AFE}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:2.8.7"
+        "ProductVersion" = "8:2.8.8"
         "Manufacturer" = "8:H1Emu © 2022"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://discord.com/invite/RM6jNkj"