Merge tag '12.2' into 12

2022-04-12 12:30:17 +01:00
parent f1232bfed7 1893dba8a1
commit 136db27f51
80 changed files with 1652 additions and 523 deletions
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -2233,7 +2233,6 @@ struct NetworkJoinStatusWindow : Window {
 	{
 		if (StrEmpty(str)) {
 			NetworkDisconnect();
-			ShowNetworkGameWindow();
 			return;
 		}