Merge branch 'master' into jgrpp

2022-04-02 14:16:32 +01:00
parent a8d99215d7 8537fa7206
commit 34af4844d1
9 changed files with 28 additions and 22 deletions
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -2232,7 +2232,6 @@ struct NetworkJoinStatusWindow : Window {
 	{
 		if (StrEmpty(str)) {
 			NetworkDisconnect();
-			ShowNetworkGameWindow();
 			return;
 		}