widelands

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

  1. bug-1827275-join_message_irc-lobby-build20
  2. Merge into build20
Proposed by Toni Förster
Status: Merged
Merged at revision: 9066
Proposed branch: lp:~widelands-dev/widelands/bug-1827275-join_message_irc-lobby-build20
Merge into: lp:widelands/build20
Diff against target: 12 lines (+1/-1)
1 file modified
src/network/internet_gaming.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1827275-join_message_irc-lobby-build20
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+366791@code.launchpad.net

Commit message

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/network/internet_gaming.cc'
2--- src/network/internet_gaming.cc 2019-02-23 11:00:49 +0000
3+++ src/network/internet_gaming.cc 2019-05-01 20:34:56 +0000
4@@ -548,7 +548,7 @@
5 bool found =
6 old.empty(); // do not show all clients, if this instance is the actual change
7 for (InternetClient& client : old) {
8- if (client.name == inc.name) {
9+ if (client.name == inc.name && client.type == inc.type) {
10 found = true;
11 client.name = "";
12 break;

Subscribers

People subscribed via source and target branches

to all changes: