[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands

[noreply]

The proposal to merge 
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands 
has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands

[bunnybot]

Continuous integration builds have changed state:

Travis build 4131. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/441254719.
Appveyor build 3928. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1794339_net_win_conditions-3928.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands

[GunChleoc]

Review: Approve

Thanks for tracking that one down :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands

[Notabilis]

Notabilis has proposed merging 
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands.

Commit message:
Adapt received path to file with win condition for the local filesystem.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1794339 in widelands: "segfault joining game"
  https://bugs.launchpad.net/widelands/+bug/1794339

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683

Fixes a bug where Linux players are unable to join games hosted by Windows 
players.

The paths to the files for win conditions are sent with the local path 
separators ('/' on Linux vs. '\' on Windows). While Windows is able to use both 
separators and as such doesn't have a problem receiving the Linux-style path, 
Linux is unable to use the Windows-style path and fails to load the win 
condition.

This branch fixes the issue by transforming the received path to its local 
representation, as is already done for the path of the map file.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands.
=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc	2018-10-09 17:02:29 +
+++ src/network/gameclient.cc	2018-10-14 11:07:15 +
@@ -793,7 +793,7 @@
 		break;
 	}
 	case NETCMD_WIN_CONDITION: {
-		d->settings.win_condition_script = packet.string();
+		d->settings.win_condition_script = g_fs->FileSystem::fix_cross_file(packet.string());
 		break;
 	}
 

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp