Merge lp:~widelands-dev/widelands/bug-1827275-join_message_irc-lobby into lp:widelands

[Toni Förster]

check for client.type to not confuse IRC and lobby names

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4850. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/527041876.
Appveyor build 4631. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1827275_join_message_irc_lobby-4631.

[GunChleoc (gunchleoc)]

LGTM :)

@bunnybot merge

review: Approve

=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc	2019-02-23 11:00:49 +0000
+++ src/network/internet_gaming.cc	2019-05-01 20:33:52 +0000
@@ -548,7 +548,7 @@
 				bool found =
 				   old.empty();  // do not show all clients, if this instance is the actual change
 				for (InternetClient& client : old) {
-					if (client.name == inc.name) {
+					if (client.name == inc.name && client.type == inc.type) {
 						found = true;
 						client.name = "";
 						break;