Merge lp:~p-martin/widelands/font_selection into lp:widelands

Proposed by Martin
Status: Merged
Merged at revision: 5879
Proposed branch: lp:~p-martin/widelands/font_selection
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
src/io/filesystem/filesystem.cc (+1/-1)
To merge this branch: bzr merge lp:~p-martin/widelands/font_selection
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+52305@code.launchpad.net

Description of the change

Although there was a comment in io/filesystem/filesystem.h just before the declaration of m_root stating that m_root *should not* contain the file separator, the variable was set to "/" in io/filesystem/filesystem.cc within the class constructor (on all systems other than Windows).

I fixed this issue, hoping that it doesn't affect anything else.
That's why I created this branch and propose for merging into trunk.

Cheers, Martin

To post a comment you must log in.
Revision history for this message
Martin (p-martin) wrote :

Ah yes, I forgot to say: this fixes bug #729772 (Unable to select font Widelands.ttf)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/io/filesystem/filesystem.cc'
2--- src/io/filesystem/filesystem.cc 2011-03-03 19:33:46 +0000
3+++ src/io/filesystem/filesystem.cc 2011-03-05 19:05:14 +0000
4@@ -67,7 +67,7 @@
5 m_root = getWorkingDirectory();
6 m_filesep = '\\';
7 #else
8- m_root = "/";
9+ m_root = ""; // must not contain filesep! see m_root declaration
10 m_filesep = '/';
11 #endif
12 }

Subscribers

People subscribed via source and target branches

to status/vote changes: