widelands

Merge lp:~hjd/widelands/prodsite-null into lp:widelands

  1. prodsite-null
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merge reported by: SirVer
Merged at revision: not available
Proposed branch: lp:~hjd/widelands/prodsite-null
Merge into: lp:widelands
Diff against target: 13 lines (+1/-1)
1 file modified
src/wui/productionsitewindow.cc (+1/-1)
To merge this branch: bzr merge lp:~hjd/widelands/prodsite-null
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+175538@code.launchpad.net

Description of the change

Found by scan-build. I believe this should fix the issue.

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

Indeed, I missed that. I noticed however than even with this fix the table is not updating in current trunk. I will push a new branch with the complete fix.

Revision history for this message
cghislai (charlyghislain) wrote :

https://code.launchpad.net/~widelands-dev/widelands/workers_table/+merge/175635

Revision history for this message
SirVer (sirver) wrote :

This is contained in charlys branch as well, so this is kinda merged. Thanks for finding this!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/wui/productionsitewindow.cc'
2--- src/wui/productionsitewindow.cc 2013-07-16 10:17:53 +0000
3+++ src/wui/productionsitewindow.cc 2013-07-18 11:25:36 +0000
4@@ -197,8 +197,8 @@
5 return;
6 }
7 }
8+ m_worker_table->update();
9 }
10- m_worker_table->update();
11 }
12
13 void ProductionSite_Window::evict_worker() {

Subscribers

People subscribed via source and target branches

to status/vote changes: