Merge lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands

Proposed by Toni Förster
Status: Merged
Merged at revision: 9152
Proposed branch: lp:~widelands-dev/widelands/bug-1833352-empty-game-names
Merge into: lp:widelands
Diff against target: 13 lines (+3/-0)
1 file modified
src/ui_fsmenu/internet_lobby.cc (+3/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1833352-empty-game-names
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+369094@code.launchpad.net

Commit message

Fix for corner case: don't set empty game name if no game is present

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5204. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548219574.
Appveyor build 4983. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1833352_empty_game_names-4983.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Yep, that fixed it :)

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 5204. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548219574.

Revision history for this message
Toni Förster (stonerl) wrote :

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ui_fsmenu/internet_lobby.cc'
2--- src/ui_fsmenu/internet_lobby.cc 2019-05-29 13:23:54 +0000
3+++ src/ui_fsmenu/internet_lobby.cc 2019-06-20 13:45:16 +0000
4@@ -445,6 +445,9 @@
5 return;
6 }
7 }
8+ if (games->empty() && servername_ui.empty()) {
9+ servername_ui = _("unnamed");
10+ }
11 }
12
13 g_options.pull_section("global").set_string("servername", servername_ui);

Subscribers

People subscribed via source and target branches

to status/vote changes: