widelands-dev team mailing list archive

[Toni Förster <toni.foerster@xxxxxxxxx>]

Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1827275-join_message_irc-lobby into lp:widelands.

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


Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1827275 in widelands: "no join message when lobby & IRC name are equal"
  https://bugs.launchpad.net/widelands/+bug/1827275

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1827275-join_message_irc-lobby/+merge/366790
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1827275-join_message_irc-lobby into lp:widelands.

=== 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;