widelands-dev team mailing list archive

[Joachim Breitner <nomeata@xxxxxxxxxx>]

Joachim Breitner has proposed merging lp:~nomeata/widelands/902464 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #902464 in widelands: "Upgrading building: number of wares in stock window not updated"
  https://bugs.launchpad.net/widelands/+bug/902464

For more details, see:
https://code.launchpad.net/~nomeata/widelands/902464/+merge/131671
-- 
https://code.launchpad.net/~nomeata/widelands/902464/+merge/131671
Your team Widelands Developers is requested to review the proposed merge of lp:~nomeata/widelands/902464 into lp:widelands.

=== 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 @@
 void WaresQueue::cleanup() {
 	assert(m_ware);
 
-	if (uint8_t const count = m_filled && m_owner.get_economy())
+	uint8_t const count = m_filled;
+	if (count && m_owner.get_economy())
 		m_owner.get_economy()->remove_wares(m_ware, count);
 
 	m_filled = 0;