From f0a1ddd81cac159ffe49271e50081692a5026544 Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Sun, 16 Apr 2023 21:27:01 +0200
Subject: [PATCH] Codechange: let FiosBrowseTo return a bool

---
 src/console_cmds.cpp | 2 +-
 src/fios.cpp         | 8 ++++----
 src/fios.h           | 2 +-
 src/fios_gui.cpp     | 8 +++-----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 4827d30cf0..c71834ef60 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -433,7 +433,7 @@ DEF_CONSOLE_CMD(ConLoad)
 		if (GetAbstractFileType(item->type) == FT_SAVEGAME) {
 			_switch_mode = SM_LOAD_GAME;
 			_file_to_saveload.SetMode(item->type);
-			_file_to_saveload.SetName(FiosBrowseTo(item));
+			_file_to_saveload.SetName(item->name);
 			_file_to_saveload.SetTitle(item->title);
 		} else {
 			IConsolePrint(CC_ERROR, "'{}' is not a savegame.", file);
diff --git a/src/fios.cpp b/src/fios.cpp
index 8563272a33..314a582927 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -145,9 +145,9 @@ StringID FiosGetDescText(const char **path, uint64 *total_free)
 /**
  * Browse to a new path based on the passed \a item, starting at #_fios_path.
  * @param *item Item telling us what to do.
- * @return A filename w/path if we reached a file, otherwise \c nullptr.
+ * @return \c true when the path got changed.
  */
-const char *FiosBrowseTo(const FiosItem *item)
+bool FiosBrowseTo(const FiosItem *item)
 {
 	switch (item->type) {
 		case FIOS_TYPE_DRIVE:
@@ -191,10 +191,10 @@ const char *FiosBrowseTo(const FiosItem *item)
 		case FIOS_TYPE_OLD_SCENARIO:
 		case FIOS_TYPE_PNG:
 		case FIOS_TYPE_BMP:
-			return item->name;
+			return false;
 	}
 
-	return nullptr;
+	return true;
 }
 
 /**
diff --git a/src/fios.h b/src/fios.h
index 0a3bae254f..9cc48ac927 100644
--- a/src/fios.h
+++ b/src/fios.h
@@ -117,7 +117,7 @@ void FiosGetSavegameList(SaveLoadOperation fop, FileList &file_list);
 void FiosGetScenarioList(SaveLoadOperation fop, FileList &file_list);
 void FiosGetHeightmapList(SaveLoadOperation fop, FileList &file_list);
 
-const char *FiosBrowseTo(const FiosItem *item);
+bool FiosBrowseTo(const FiosItem *item);
 
 StringID FiosGetDescText(const char **path, uint64 *total_free);
 bool FiosDelete(const char *name);
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index 4d963e5ff3..1ad14397f5 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -634,9 +634,8 @@ public:
 			case WID_SL_LOAD_BUTTON: {
 				if (this->selected == nullptr || _load_check_data.HasErrors()) break;
 
-				const char *name = FiosBrowseTo(this->selected);
 				_file_to_saveload.SetMode(this->selected->type);
-				_file_to_saveload.SetName(name);
+				_file_to_saveload.SetName(this->selected->name);
 				_file_to_saveload.SetTitle(this->selected->title);
 
 				if (this->abstract_filetype == FT_HEIGHTMAP) {
@@ -676,8 +675,7 @@ public:
 				}
 				const FiosItem *file = &this->fios_items[y];
 
-				const char *name = FiosBrowseTo(file);
-				if (name == nullptr) {
+				if (FiosBrowseTo(file)) {
 					/* Changed directory, need refresh. */
 					this->InvalidateData(SLIWD_RESCAN_FILES);
 					break;
@@ -708,7 +706,7 @@ public:
 						} else {
 							assert(this->abstract_filetype == FT_HEIGHTMAP);
 							_file_to_saveload.SetMode(file->type);
-							_file_to_saveload.SetName(name);
+							_file_to_saveload.SetName(file->name);
 							_file_to_saveload.SetTitle(file->title);
 
 							this->Close();