Merge lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Proposed by
Tino
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 8051 | ||||||||
Proposed branch: | lp:~widelands-dev/widelands/bug-1588063 | ||||||||
Merge into: | lp:widelands | ||||||||
Diff against target: |
182 lines (+48/-12) 7 files modified
src/editor/ui_menus/main_menu_save_map.cc (+9/-3) src/editor/ui_menus/main_menu_save_map_make_directory.cc (+3/-1) src/io/filesystem/disk_filesystem.cc (+14/-6) src/io/filesystem/layered_filesystem.cc (+15/-0) src/io/filesystem/layered_filesystem.h (+2/-0) src/logic/save_handler.cc (+3/-1) src/wui/game_main_menu_save_game.cc (+2/-1) |
||||||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1588063 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tino | Approve | ||
GunChleoc | Needs Resubmitting | ||
Klaus Halfmann | compile, review, test | Approve | |
Review via email:
|
Commit message
Fix automatic creation of the maps/My_Maps folder in Windows. Prevent the user from entering illegal filenames.
Description of the change
Use system dependant file seperator for the My_Maps subdirectory.
Now ensure_
I don't like the #ifdef __win32 solution, but i was not able to FileSystem:
Suggestions welcome.
To post a comment you must log in.
Ah, bl*** file separators, my bad.
I will look into concatenating this properly.