(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai

Barotrauma/BarotraumaClient/Source/GameMain.cs

@@ -178,7 +178,6 @@ namespace Barotrauma
 
             GUI.KeyboardDispatcher = new EventInput.KeyboardDispatcher(Window);
 
-
             PerformanceCounter = new PerformanceCounter();
 
             IsFixedTimeStep = false;
@@ -322,6 +321,11 @@ namespace Barotrauma
                 DebugConsole.NewMessage("LOADING COROUTINE", Color.Lime);
             }
 
+            while (TitleScreen.WaitForLanguageSelection)
+            {
+                yield return CoroutineStatus.Running;
+            }
+
             SoundManager = new Sounds.SoundManager();
             SoundManager.SetCategoryGainMultiplier("default", Config.SoundVolume);
             SoundManager.SetCategoryGainMultiplier("ui", Config.SoundVolume);
@@ -370,11 +374,9 @@ namespace Barotrauma
             InitUserStats();
 
         yield return CoroutineStatus.Running;
-
-
+            
             LightManager = new Lights.LightManager(base.GraphicsDevice, Content);
 
-            WaterRenderer.Instance = new WaterRenderer(base.GraphicsDevice, Content);
             TitleScreen.LoadState = 1.0f;
         yield return CoroutineStatus.Running;
 
@@ -525,7 +527,7 @@ namespace Barotrauma
         protected override void UnloadContent()
         {
             Video.Close();
-            SoundManager.Dispose();
+            SoundManager?.Dispose();
         }
 
         /// <summary>