(22af8c988) Don't crash them game if playing the splash screen fails

Barotrauma/BarotraumaClient/Source/GameMain.cs

@@ -318,8 +318,16 @@ namespace Barotrauma
             SoundManager.SetCategoryGainMultiplier("voip", Config.VoiceChatVolume);
             if (Config.EnableSplashScreen)
             {
-                (TitleScreen as LoadingScreen).SplashScreen = new Video(base.GraphicsDevice, SoundManager, "Content/splashscreen.mp4", 1280, 720);
+                try
-            }
+                {
+                    (TitleScreen as LoadingScreen).SplashScreen = new Video(base.GraphicsDevice, SoundManager, "Content/splashscreen.mp4", 1280, 720);
+                }
+                catch (Exception e)
+                {
+                    Config.EnableSplashScreen = false;
+                    DebugConsole.ThrowError("Playing the splash screen failed.", e);
+                }
+             }
 
             GUI.Init(Window, Config.SelectedContentPackages, GraphicsDevice);
             DebugConsole.Init();

Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs

@@ -89,13 +89,6 @@ namespace Barotrauma
 
             var tickBoxHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), filterHolder.RectTransform));
 
-            var filterHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform)) { RelativeSpacing = 0.05f };
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), filterHolder.RectTransform), TextManager.Get("FilterServers"));
-            searchBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), filterHolder.RectTransform), "");
-
-            var tickBoxHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), filterHolder.RectTransform));
-
             searchBox.OnTextChanged += (txtBox, txt) => { FilterServers(); return true; };
             filterPassword = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterPassword"));
             filterPassword.OnSelected += (tickBox) => { FilterServers(); return true; };
@@ -159,6 +152,58 @@ namespace Barotrauma
                 Enabled = false
             };
 
+            //-------------------------------------------------------------------------------------
+            //right column
+            //-------------------------------------------------------------------------------------
+
+            var rightColumn = new GUILayoutGroup(new RectTransform(new Vector2(1.0f - leftColumn.RectTransform.RelativeSize.X - 0.017f, 1.0f),
+                paddedFrame.RectTransform, Anchor.CenterRight))
+            {
+                RelativeSpacing = 0.02f,
+                Stretch = true
+            };
+
+            var serverListHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), rightColumn.RectTransform)) { Stretch = true, RelativeSpacing = 0.02f };
+
+            serverList = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), serverListHolder.RectTransform, Anchor.Center))
+            {
+                OnSelected = (btn, obj) => {
+                    ServerInfo serverInfo = (ServerInfo)obj;
+
+                    serverInfo.CreatePreviewWindow(serverPreview);
+
+                    return true;
+                }
+            };
+
+            serverList.OnSelected += SelectServer;
+
+            serverPreview = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), serverListHolder.RectTransform, Anchor.Center));
+
+            columnRelativeWidth = new float[] { 0.04f, 0.02f, 0.044f, 0.77f, 0.02f, 0.075f, 0.06f };
+
+            var buttonContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.075f), rightColumn.RectTransform), style: null);
+
+            GUIButton button = new GUIButton(new RectTransform(new Vector2(0.25f, 0.9f), buttonContainer.RectTransform, Anchor.TopLeft),
+                TextManager.Get("Back"), style: "GUIButtonLarge")
+            {
+                OnClicked = GameMain.MainMenuScreen.ReturnToMainMenu
+            };
+
+			var refreshButton = new GUIButton(new RectTransform(new Vector2(buttonContainer.Rect.Height / (float)buttonContainer.Rect.Width, 0.9f), buttonContainer.RectTransform, Anchor.Center),
+				"", style: "GUIButtonRefresh") {
+
+				ToolTip = TextManager.Get("ServerListRefresh"),
+				OnClicked = RefreshServers
+			};
+
+            joinButton = new GUIButton(new RectTransform(new Vector2(0.25f, 0.9f), buttonContainer.RectTransform, Anchor.TopRight),
+                TextManager.Get("ServerListJoin"), style: "GUIButtonLarge")
+            {
+                OnClicked = JoinServer,
+                Enabled = false
+            };
+
             //--------------------------------------------------------
 
             button.SelectedColor = button.Color;