Merge lp://staging/~widelands-dev/widelands/bug-1786163 into lp://staging/widelands

Proposed by TiborB
Status: Merged
Merged at revision: 8788
Proposed branch: lp://staging/~widelands-dev/widelands/bug-1786163
Merge into: lp://staging/widelands
Diff against target: 19 lines (+9/-0)
1 file modified
src/ai/defaultai_seafaring.cc (+9/-0)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/bug-1786163
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+352947@code.staging.launchpad.net

Commit message

When AI finds a second ship in expedition - it cancels the expedition. AI is written to control only one expedition at once.

Description of the change

AI should not start second expedition, but it happened. And this led to crash. I introduced very simple workaround here - just cancel such second expedition. Still it is mystery why this had happened. I introduced a log about this so player will get some more info about what is going on...

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

Code LGTM :)

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

Continuous integration builds have changed state:

Travis build 3779. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/415308135.
Appveyor build 3578. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1786163-3578.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Tested. Thanks for the fix!

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3812. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/416774822.
Appveyor build 3611. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1786163-3611.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: