Merge lp:~nomeata/widelands/902464 into lp:widelands

Proposed by Joachim Breitner
Status: Merged
Merged at revision: 6434
Proposed branch: lp:~nomeata/widelands/902464
Merge into: lp:widelands
Diff against target: 13 lines (+2/-1)
1 file modified
src/economy/wares_queue.cc (+2/-1)
To merge this branch: bzr merge lp:~nomeata/widelands/902464
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+131671@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/economy/wares_queue.cc'
--- src/economy/wares_queue.cc 2012-02-15 21:25:34 +0000
+++ src/economy/wares_queue.cc 2012-10-26 18:18:22 +0000
@@ -64,7 +64,8 @@
64void WaresQueue::cleanup() {64void WaresQueue::cleanup() {
65 assert(m_ware);65 assert(m_ware);
6666
67 if (uint8_t const count = m_filled && m_owner.get_economy())67 uint8_t const count = m_filled;
68 if (count && m_owner.get_economy())
68 m_owner.get_economy()->remove_wares(m_ware, count);69 m_owner.get_economy()->remove_wares(m_ware, count);
6970
70 m_filled = 0;71 m_filled = 0;

Subscribers

People subscribed via source and target branches

to status/vote changes: