From 12ad53297d5617312b8b8fb26102ec8a7c68a64a Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue, 4 Jun 2019 16:00:57 +0300
Subject: [PATCH] (657674526) Reallow changing resolution in
 fullscreen/borderless. TODO: test, disable in borderless because it seems to
 do nothing?

---
 .../Source/GameSession/RoundSummary.cs                |  6 ------
 Barotrauma/BarotraumaClient/Source/GameSettings.cs    |  2 --
 .../Source/Screens/ServerListScreen.cs                | 11 +++++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs b/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs
index 0df6cf869..e3e2992c6 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs
@@ -55,12 +55,6 @@ namespace Barotrauma
                 RelativeSpacing = 0.03f
             };
 
-            GUIListBox infoTextBox = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.7f), paddedFrame.RectTransform));
-            
-            string summaryText = TextManager.GetWithVariables(gameOver ? "RoundSummaryGameOver" :
-                (progress ? "RoundSummaryProgress" : "RoundSummaryReturn"), new string[2] { "[sub]", "[location]" },
-                new string[2] { Submarine.MainSub.Name, progress ? GameMain.GameSession.EndLocation.Name : GameMain.GameSession.StartLocation.Name });
-
             var infoText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform),
                 summaryText, wrap: true);
 
diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
index 6a6d0faa4..8da3e182d 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
@@ -207,9 +207,7 @@ namespace Barotrauma
             var resolutionDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), elementCount: supportedDisplayModes.Count)
             {
                 OnSelected = SelectResolution,
-#if !LINUX
                 ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed
-#endif
         };
 
             foreach (DisplayMode mode in supportedDisplayModes)
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
index cd818ced3..9bcc3deed 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
@@ -199,6 +199,10 @@ namespace Barotrauma
                     UserData = "noresults"
                 };
             }
+            else
+            {
+                joinButton.Enabled = false;
+            }
 
             return true;
         }
@@ -559,6 +563,13 @@ namespace Barotrauma
                                 .Replace("[statuscode]", masterServerResponse.StatusCode.ToString())
                                 .Replace("[statusdescription]", masterServerResponse.StatusDescription));
                         break;
+                    case System.Net.HttpStatusCode.ServiceUnavailable:
+                        new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"), 
+                            TextManager.Get("MasterServerErrorUnavailable")
+                                .Replace("[masterserverurl]", NetConfig.MasterServerUrl)
+                                .Replace("[statuscode]", masterServerResponse.StatusCode.ToString())
+                                .Replace("[statusdescription]", masterServerResponse.StatusDescription));
+                        break;
                     case System.Net.HttpStatusCode.ServiceUnavailable:
                         new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"), 
                             TextManager.Get("MasterServerErrorUnavailable"));