Merge lp://staging/~widelands-dev/widelands/bug-1695701-militarywindow-crash into lp://staging/widelands
Proposed by
GunChleoc
Status: | Merged |
---|---|
Merged at revision: | 8374 |
Proposed branch: | lp://staging/~widelands-dev/widelands/bug-1695701-militarywindow-crash |
Merge into: | lp://staging/widelands |
Diff against target: |
75 lines (+17/-8) 3 files modified
src/logic/map_objects/tribes/militarysite.cc (+5/-3) src/wui/buildingwindow.cc (+11/-5) src/wui/buildingwindow.h (+1/-0) |
To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/bug-1695701-militarywindow-crash |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Klaus Halfmann | code review, compile, short test | Approve | |
GunChleoc | Needs Resubmitting | ||
Review via email: mp+325040@code.staging.launchpad.net |
Commit message
Fix crash when a militarysite window is open while the enemy conquers it by sending a notification. Refactored out die() function to avoid code duplication.
To post a comment you must log in.
Just ran into this (again?),
time to get it fixed.
Codew review: /building, building_ ->/building_ , building_ /&building_
build all around *building_
LGTM
compiled, have an autosave a minute before being atacked an
get a crash at:
[Host]: Received ping from metaserver. -crash klaus$
Forcing flag at (123, 19)
Segmentation fault: 11
maikafer:bug-1695701-militarywindow
Thread 0 Crashed:: Dispatch queue: com.apple. main-thread :think( ) + 255 (buildingwindow .cc:153) :do_think( ) + 51 (panel.cc:458) :do_think( ) + 83 (panel.cc:458)
0 widelands 0x000000010dbed06f BuildingWindow:
1 widelands 0x000000010daafb03 UI::Panel:
2 widelands 0x000000010daafb23 UI::Panel:
Mhh, this is quite some complex code there, Ill simply it and try again