widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1406298-campvis-file into lp:widelands.

Commit message:
Check for campvis file with and without fix_cross_file

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1406298 in widelands: "Load game screen lists campvis file"
  https://bugs.launchpad.net/widelands/+bug/1406298

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1406298-campvis-file/+merge/346915

This branch is completely untested. We need to verify the bug on trunk on WIndows, then check if this branch fixes it.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1406298-campvis-file into lp:widelands.

=== modified file 'src/wui/load_or_save_game.cc'
--- src/wui/load_or_save_game.cc	2018-05-14 06:59:39 +0000
+++ src/wui/load_or_save_game.cc	2018-05-27 07:13:03 +0000
@@ -317,7 +317,7 @@
 	Widelands::GamePreloadPacket gpdp;
 
 	for (const std::string& gamefilename : gamefiles) {
-		if (gamefilename == g_fs->fix_cross_file("save/campvis")) {
+		if (gamefilename == kCampvisFile || gamefilename == g_fs->fix_cross_file(kCampvisFile)) {
 			continue;
 		}