widelands-dev team mailing list archive

[Martin <p_martin@xxxxxxx>]

Martin has proposed merging lp:~p-martin/widelands/font_selection into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~p-martin/widelands/font_selection/+merge/52305

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

-- 
https://code.launchpad.net/~p-martin/widelands/font_selection/+merge/52305
Your team Widelands Developers is requested to review the proposed merge of lp:~p-martin/widelands/font_selection into lp:widelands.

=== modified file 'src/io/filesystem/filesystem.cc'
--- src/io/filesystem/filesystem.cc	2011-03-03 19:33:46 +0000
+++ src/io/filesystem/filesystem.cc	2011-03-05 19:05:14 +0000
@@ -67,7 +67,7 @@
 	m_root = getWorkingDirectory();
 	m_filesep = '\\';
 #else
-	m_root = "/";
+	m_root = "";  // must not contain filesep! see m_root declaration
 	m_filesep = '/';
 #endif
 }