widelands-dev team mailing list archive

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

Addressed your concerns regarding the red border. I also fixed a crash. Would you have a look at the diff comment, please?

Diff comments:

> 
> === modified file 'src/ui_fsmenu/internet_lobby.cc'
> --- src/ui_fsmenu/internet_lobby.cc	2019-05-05 00:22:27 +0000
> +++ src/ui_fsmenu/internet_lobby.cc	2019-05-09 10:57:53 +0000
> @@ -415,10 +426,22 @@
>  	// Save selected servername as default for next time and during that take care that the name is
>  	// not empty.
>  	std::string servername_ui = edit_servername_.text();
> -	if (servername_ui.empty()) {
> -		/** TRANSLATORS: This is shown for multiplayer games when no host */
> -		/** TRANSLATORS: server to connect to has been specified yet. */
> -		servername_ui = pgettext("server_name", "unnamed");
> +
> +	const std::vector<InternetGame>* games = InternetGaming::ref().games();
> +	if (games != nullptr) {
> +		for (const InternetGame& game : *games) {
> +			if (servername_ui.empty()) {
> +				uint32_t i = 1;
> +				do {
> +					/** TRANSLATORS: This is shown for multiplayer games when no host */
> +					/** TRANSLATORS: server to connect to has been specified yet. */
> +					servername_ui = (boost::format(_("unnamed %u")) % i++).str();

Is this line correctly formatted?

> +				} while (servername_ui == game.name);
> +			} else if (game.name == servername_ui) {
> +				change_servername();
> +				return;
> +			}
> +		}
>  	}
>  
>  	g_options.pull_section("global").set_string("servername", servername_ui);


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands.