[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1695701-militarywindow-crash into lp:widelands

2017-06-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1695701-militarywindow-crash into lp:widelands. Commit message: Fix crash when a militarysite window is open while the enemy conquers it - Turned buildings in building windows from pointer to reference, so we can check whether it's

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-06-04 Thread bunnybot
Continuous integration builds have changed state: Travis build 2272. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/239238741. Appveyor build 2107. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_net_boost_

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-06-04 Thread Klaus Halfmann
Review: Approve compile, test, small review One nit inline - no need to fix this. We should get this in now, otherwise we will never get enouht testing coverage. Notablilis: try pulling the cable at several stepts in the game, maybe there is one error left, I am no 100% sure. FAPP tthis is OK f

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-06-04 Thread bunnybot
Continuous integration builds have changed state: Travis build 2273. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/239238959. Appveyor build 2108. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc7-2108.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1695701-militarywindow-crash into lp:widelands

2017-06-04 Thread Klaus Halfmann
Review: Needs Fixing Just ran into this (again?), time to get it fixed. Codew review: build all around *building_/building, building_->/building_, building_/&building_ LGTM compiled, have an autosave a minute before being atacked an get a crash at: [Host]: Received ping from metaserver. Fo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1695701-militarywindow-crash into lp:widelands

2017-06-04 Thread Klaus Halfmann
I simpified the code a bit, but this makes the carsh just appear somewhere else. Gun: do you need my savegame? Will try with a debugger, later -- https://code.launchpad.net/~widelands-dev/widelands/bug-1695701-militarywindow-crash/+merge/325040 Your team Widelands Developers is subscribed to bra

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1695701-militarywindow-crash into lp:widelands

2017-06-04 Thread Klaus Halfmann
Review: Needs Fixing Mhh, thats ood, last "normal" code in Debugger is: void Panel::do_think() { if (thinks()) think(); I don get it, where/when is BuildingWindow::building_ set to null? looks like building_ point to some reclaimed space? -- https://code.launchpad.net/~widelands-de

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-06-04 Thread Notabilis
Thanks for the explanation and fixing Bunnybot! Good to see that it is working again. I did a short test with two network interfaces on Linux. With the current code one packet is sent on both interfaces, so the kernel (or so) is already dealing with duplicating them. With the apple-code, two pa

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-06-04 Thread Notabilis
Pushed a fix for an assert(state_ == OFFLINE) bug which I encountered. The problem was that on crash of a hosted game the logic jumped back to the main menu without closing the connection to the metaserver. So when the player tries to connect again, he already is connected to the metaserver (and

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-06-04 Thread Klaus Halfmann
Ahh. As I have an untrustbale network cable I have seen this already. You changes are fine with me. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-boost-asio. _

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1695701-militarywindow-crash into lp:widelands

2017-06-04 Thread bunnybot
Continuous integration builds have changed state: Travis build 2276. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/239306428. Appveyor build 2111. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_169570