From 8b3623ae07e2d6a34fb9166c07953252ccdfb3a0 Mon Sep 17 00:00:00 2001
From: Miepee <38186597+Miepee@users.noreply.github.com>
Date: Wed, 29 Dec 2021 14:48:46 +0100
Subject: [PATCH] upgrade eto *properly*

---
 AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj | 2 +-
 AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj | 2 +-
 AM2RLauncher/AM2RLauncher/MainForm/ImageButton.cs     | 1 +
 AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
index da9262b..80293d9 100644
--- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
+++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Gtk" Version="2.5.11" />
+    <PackageReference Include="Eto.Platform.Gtk" Version="2.6.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj b/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj
index e265ed5..d553da1 100644
--- a/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj
+++ b/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Windows" Version="2.5.11" />
+    <PackageReference Include="Eto.Platform.Windows" Version="2.6.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AM2RLauncher/AM2RLauncher/MainForm/ImageButton.cs b/AM2RLauncher/AM2RLauncher/MainForm/ImageButton.cs
index 92ce2cc..3f03f60 100644
--- a/AM2RLauncher/AM2RLauncher/MainForm/ImageButton.cs
+++ b/AM2RLauncher/AM2RLauncher/MainForm/ImageButton.cs
@@ -73,6 +73,7 @@ namespace Pablo.Controls
                     }
                     using (var bd = disabledImage.Lock())
                     {
+                        
                         unsafe
                         {
                             var data = (int*)bd.Data;
diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
index a5500de..f30f4f1 100644
--- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
+++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
@@ -636,7 +636,7 @@ namespace AM2RLauncher
 
             settingsLayout.BeginHorizontal();
             settingsLayout.AddSpace();
-            settingsLayout.AddColumn(null, languageLabel, languageDropDown, autoUpdateAM2RCheck, autoUpdateLauncherCheck, hqMusicPCCheck, hqMusicAndroidCheck, (Control)profileDebugLogCheck ?? new Label(), customEnvVarLabel, (Control)customEnvVarTextBox ?? new Label(), mirrorLabel, mirrorDropDown, customMirrorCheck, customMirrorTextBox, null);
+            settingsLayout.AddColumn(null, languageLabel, languageDropDown, autoUpdateAM2RCheck, autoUpdateLauncherCheck, hqMusicPCCheck, hqMusicAndroidCheck, profileDebugLogCheck, customEnvVarLabel, (Control)customEnvVarTextBox ?? new Label(), mirrorLabel, mirrorDropDown, customMirrorCheck, customMirrorTextBox, null);
             settingsLayout.AddSpace();
 
             TabPage settingsPage = new TabPage