widelands

Merge lp:~widelands-dev/widelands/bug-1766672-multiplayer-closed-slots into lp:widelands

  1. bug-1766672-multiplayer-closed-slots
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8698
Proposed branch: lp:~widelands-dev/widelands/bug-1766672-multiplayer-closed-slots
Merge into: lp:widelands
Diff against target: 10 lines (+1/-1)
1 file modified
src/logic/game_settings.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1766672-multiplayer-closed-slots
Reviewer Review Type Date Requested Status
Notabilis Approve
Review via email: mp+345337@code.launchpad.net

Commit message

Closed slots in multiplayer savegames now stay closed

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

Continuous integration builds have changed state:

Travis build 3485. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/377157472.
Appveyor build 3290. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1766672_multiplayer_closed_slots-3290.

Revision history for this message
Notabilis (notabilis27) wrote :

I haven't follows the call trace all the way back but the bug is fixed and the change looks reasonable.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for the fast review! :)

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/game_settings.cc'
2--- src/logic/game_settings.cc 2018-04-07 16:59:00 +0000
3+++ src/logic/game_settings.cc 2018-05-10 06:40:50 +0000
4@@ -34,5 +34,5 @@
5 }
6
7 bool GameSettings::uncloseable(PlayerSlot slot) const {
8- return (scenario && !players.at(slot).closeable) || savegame;
9+ return (scenario && !players.at(slot).closeable) || (savegame && players.at(slot).state != PlayerSettings::State::kClosed);
10 }

Subscribers

People subscribed via source and target branches

to status/vote changes: