From 1a4ccea0290443d67b577fe88fec8fa5dc28162e Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 16 May 2021 22:05:26 +1000 Subject: [PATCH] GUI: Fix ampersands not showing in 'insert token' popup dialog --- GUI/Popups/TokenSelector.cs | 3 ++- MCGalaxy/Server/Maintenance/Updater.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GUI/Popups/TokenSelector.cs b/GUI/Popups/TokenSelector.cs index c05569516..1178c4f3b 100644 --- a/GUI/Popups/TokenSelector.cs +++ b/GUI/Popups/TokenSelector.cs @@ -37,9 +37,10 @@ namespace MCGalaxy.Gui.Popups { btn.TabIndex = index; toolTip.SetToolTip(btn, token.Description); - btn.Text = token.Trigger; + btn.Text = token.Trigger; btn.Click += delegate { Token = token.Trigger; DialogResult = DialogResult.OK; Close(); }; btn.Margin = new Padding(0); + btn.UseMnemonic = false; btn.UseVisualStyleBackColor = false; btn.Font = new Font("Microsoft Sans Serif", 9.5F, FontStyle.Regular, GraphicsUnit.Point, 0); Controls.Add(btn); diff --git a/MCGalaxy/Server/Maintenance/Updater.cs b/MCGalaxy/Server/Maintenance/Updater.cs index 809d42ca3..a96c25d9d 100644 --- a/MCGalaxy/Server/Maintenance/Updater.cs +++ b/MCGalaxy/Server/Maintenance/Updater.cs @@ -31,7 +31,7 @@ namespace MCGalaxy { public const string BaseURL = "https://raw.githubusercontent.com/UnknownShadow200/MCGalaxy/master/"; public const string UploadsURL = "https://github.com/UnknownShadow200/MCGalaxy/tree/master/Uploads"; - const string CurrentVersionFile = BaseURL + "Uploads/current_version.txt"; + const string CurrentVersionURL = BaseURL + "Uploads/current_version.txt"; #if TEN_BIT_BLOCKS const string dllURL = BaseURL + "Uploads/MCGalaxy_infid.dll?raw=true"; #else @@ -53,7 +53,7 @@ namespace MCGalaxy { WebClient client = HttpUtil.CreateWebClient(); try { - string latest = client.DownloadString(CurrentVersionFile); + string latest = client.DownloadString(CurrentVersionURL); if (new Version(Server.Version) >= new Version(latest)) { Logger.Log(LogType.SystemActivity, "No update found!");