Merge lp:~aber/widelands/datadir into lp:widelands
Status: | Merged |
---|---|
Merged at revision: | 5860 |
Proposed branch: | lp:~aber/widelands/datadir |
Merge into: | lp:widelands |
Diff against target: |
103 lines (+36/-27) 2 files modified
src/wlapplication.cc (+35/-27) src/wlapplication.h (+1/-0) |
To merge this branch: | bzr merge lp:~aber/widelands/datadir |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
SirVer | Approve | ||
Review via email: mp+50547@code.launchpad.net |
Description of the change
A short recapitulation of the problem. If you start widelands in a different way then ./widelands it will not find the datadir and crash (Mac OS X). Also, if someone would use a pointing device. This problem occured also in build15 with the locale directory.
I always asked myself, why it was possible to detect the data directory but not the locale directory. Now widelands is not more able to find the data directory.
I will try to apply the same fix as currently used for the locale problem.
A. Please take a look at my code. I'm still unsecure writing c++ code.
B. Maybe someone knows how it was possible to detect the datadir with the portable or non absolute setup. Maybe it is possible to remove all that platform dependend code again.
Looks clear enough to me. I vote for inclusion in build 16. I will do the merge myself this evening, if noone complains.