Merge lp:~qcumber-some/widelands/bug704637 into lp:widelands
Proposed by
Jens Beyer
Status: | Merged |
---|---|
Merged at revision: | 6520 |
Proposed branch: | lp:~qcumber-some/widelands/bug704637 |
Merge into: | lp:widelands |
Diff against target: |
47 lines (+16/-4) 2 files modified
src/constants.h (+4/-0) src/graphic/graphic.cc (+12/-4) |
To merge this branch: | bzr merge lp:~qcumber-some/widelands/bug704637 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
SirVer | Approve | ||
Jens Beyer | Needs Resubmitting | ||
Review via email: mp+150915@code.launchpad.net |
Description of the change
Just as hjd proposed in the bug, simply try to fall back to default settings if the other two tries fail.
Interesting "feature" is, that the setting from .config file is still visible in the config screen, while the window is in tiny 640x480. I don't think this is a bug, but you may comment on that.
I don't know if we should tell the user that something's wrong, this could be quite difficult this early in the game. On the other hand, if I am faced by this tiny window, I am definitely looking for the graphics configuration ingame to fix it, so I will see my mistake.
To post a comment you must log in.
Thanks for tackling this!
Move the second check (!sdlsurface) into the first - otherwise you check twice for the same condition. I suggest merging the log's into one. And I suggest making the minimum graphics explicit via some consts in constants.h or widelands.h.