Merge lp:~widelands-dev/widelands/bug-1704449-net-assert into lp:widelands

[Notabilis]

Removing invalid assert in code for metaserver communication.

Removing an assert which does not always hold. When I am not wrong, the assert can't hold in some situations. This is no bug in the code but just a case of unexpected timing, which makes the assert fail.

See linked bug report for a longer explanation.

[Klaus Halfmann (klaus-halfmann)]

looks straigt forward,
Ill fetch the compile from appveyor juts to be sure.

BTW, is there some central place whre I can finde those state transitions
indicated by IGPCMD_GAME_OPEN?

[Notabilis (notabilis27)]

The documentation about the network commands for the metaserver is in src/network/internet_gaming_protocol.h. But I guess it is not quite what you are looking for. Other than that, you can only search for it in src/network/internet_gaming.cc where all the code for communicating with the metaserver is located.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2463. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/256424684.
Appveyor build 2288. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1704449_net_assert-2288.

[GunChleoc (gunchleoc)]

LGTM :)

@bunnybot merge

review: Approve

=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc	2017-07-01 08:22:54 +0000
+++ src/network/internet_gaming.cc	2017-07-22 17:33:46 +0000
@@ -598,8 +598,10 @@
 
 		else if (cmd == IGPCMD_GAME_OPEN) {
 			// Client received the acknowledgment, that the game was opened
-			assert(waitcmd_ == IGPCMD_GAME_OPEN);
-			waitcmd_ = "";
+			// We can't use an assert here since this message might arrive after the game already started
+			if (waitcmd_ == IGPCMD_GAME_OPEN) {
+				waitcmd_ = "";
+			}
 		}
 
 		else if (cmd == IGPCMD_GAME_CONNECT) {