fix double-playing of music, etc.

OpenRA.Game/Sound.cs

@@ -79,6 +79,9 @@ namespace OpenRA
 			if (name == "" || name == null)
 				return;
 
+			if (music != null)
+				soundEngine.StopSound(music);
+			
 			var sound = sounds[name];
 			music = soundEngine.Play2D(sound, true);
 			music.Volume = musicVolume;

OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs

@@ -26,11 +26,11 @@ namespace OpenRA.Widgets.Delegates
 		{
 			var r = Chrome.rootWidget;
 			r.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => {
-				r.CloseWindow();
+				Game.Disconnect();
 				return true;
 			};
 			r.GetWidget("CONNECTION_BUTTON_CANCEL").OnMouseUp = mi => {
-				r.CloseWindow();
+				Game.Disconnect();
 				return true;
 			};
 			r.GetWidget("CONNECTION_BUTTON_RETRY").OnMouseUp = mi => {

OpenRA.Game/Widgets/Widget.cs

@@ -209,6 +209,7 @@ namespace OpenRA.Widgets
 		public void CloseWindow()
 		{
 			Chrome.rootWidget.GetWidget(WindowList.Pop()).Visible = false;
+			if (WindowList.Count > 0)
 				Chrome.rootWidget.GetWidget(WindowList.Peek()).Visible = true;
 		}