Merge lp:~widelands-dev/widelands/bug-1822437-missing-savegames into lp:widelands

[GunChleoc]

Show all savegame files in save game menu.

Multiplayer savegame files are missing in the save game menu. This fixes it.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4660. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/513575340.
Appveyor build 4447. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1822437_missing_savegames-4447.

[hessenfarmer (stephan-lutz)]

tested the branch
multiplayer savegames are now shown in both savegame menus
found no issues

@bunnybot merge

review: Approve (test)

[GunChleoc (gunchleoc)]

Thank you very much for the review :)

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4660. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/513575340.

[hessenfarmer (stephan-lutz)]

travis failure is transient

@bunnybot merge force

=== modified file 'src/wui/load_or_save_game.cc'
--- src/wui/load_or_save_game.cc	2019-02-23 11:00:49 +0000
+++ src/wui/load_or_save_game.cc	2019-03-30 20:28:33 +0000
@@ -385,8 +385,9 @@
 		SavegameData gamedata;
 
 		std::string savename = gamefilename;
-		if (filetype_ == FileType::kReplay)
+		if (filetype_ == FileType::kReplay) {
 			savename += kSavegameExtension;
+		}
 
 		if (!g_fs->file_exists(savename.c_str())) {
 			continue;
@@ -400,7 +401,8 @@
 
 			gamedata.gametype = gpdp.get_gametype();
 
-			if (filetype_ != FileType::kReplay) {
+			// Skip singleplayer games in multiplayer mode and vice versa
+			if (filetype_ != FileType::kReplay && filetype_ != FileType::kShowAll) {
 				if (filetype_ == FileType::kGameMultiPlayer) {
 					if (gamedata.gametype == GameController::GameType::kSingleplayer) {
 						continue;