Merge lp:~notabilis27/widelands/bug-tab-crash into lp:widelands

Proposed by Notabilis
Status: Merged
Merged at revision: 8031
Proposed branch: lp:~notabilis27/widelands/bug-tab-crash
Merge into: lp:widelands
Diff against target: 28 lines (+6/-1)
2 files modified
data/txts/developers.json (+2/-1)
src/ui_basic/panel.cc (+4/-0)
To merge this branch: bzr merge lp:~notabilis27/widelands/bug-tab-crash
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+299630@code.launchpad.net
To post a comment you must log in.
Revision history for this message
TiborB (tiborb95) wrote :

Tested, the crash is gone.

Revision history for this message
SirVer (sirver) wrote :

lgtm. Thank you!

I just realized that you are not yet mentioned in data/txts/developers.json. Could you add yourself as last entry in members and merge this?

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1179. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/143755481.
Appveyor build 1017. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_notabilis27_widelands_bug_tab_crash-1017.

Revision history for this message
Notabilis (notabilis27) wrote :

Assuming that you mean me: Adding myself to the list is no problem.
But I am not sure what you mean with "merge". Add the change to this branch? Create a new branch and merge with this one? Merge this one into trunk?
The last one I can't do as far as I know and the second one seems strange to me. However the first one is without any merge, so I am probably missing something.

Revision history for this message
SirVer (sirver) wrote :

I am sorry that I was unclear. I should have explained more carefully, but had little time.

It is true that you cannot merge yourself into trunk. But everybody can instruct bunnybot to do so - and bunnybot should really be the only committer to trunk besides other bots. Bunnybot has no ACLs because they were never necessary - noybody ever tried to sneak code in that was not agreed on being a good idea.

So what I meant was: add yourself to the list of devs in this branch, and then merge yourself by instructing bunnybot to do so. You can do that by replying here and including in your reply on a line of its own "@bunnybot merge".

Revision history for this message
Notabilis (notabilis27) wrote :

Thanks for the explanation, is done now.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/txts/developers.json'
2--- data/txts/developers.json 2016-04-29 06:38:10 +0000
3+++ data/txts/developers.json 2016-07-13 05:50:36 +0000
4@@ -107,7 +107,8 @@
5 "Miroslav Remák (MiroslavR)",
6 "Janosch Peters",
7 "Hasi50 (Klaus Halfmann)",
8- "Philipp Klaus Krause (PkK)"
9+ "Philipp Klaus Krause (PkK)",
10+ "Notabilis"
11 ]
12 }
13 ]
14
15=== modified file 'src/ui_basic/panel.cc'
16--- src/ui_basic/panel.cc 2016-07-11 16:54:52 +0000
17+++ src/ui_basic/panel.cc 2016-07-13 05:50:36 +0000
18@@ -550,6 +550,10 @@
19 if (down) {
20 if (focus_) {
21 Panel * p = focus_->next_;
22+ if (focus_ == last_child_) {
23+ p = first_child_;
24+ }
25+
26 switch (code.sym) {
27
28 case SDLK_TAB:

Subscribers

People subscribed via source and target branches

to status/vote changes: