From: Toni Wilen <twilen@winuae.net>
Date: Sun, 2 Dec 2018 14:26:42 +0000 (+0200)
Subject: read_rom_name_guess() should also set rom path if rom is found.
X-Git-Tag: 4100~5
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=e0f35f2152cc60fedfc4b592f5a11ce4061598b8;p=francis%2Fwinuae.git

read_rom_name_guess() should also set rom path if rom is found.
---

diff --git a/include/rommgr.h b/include/rommgr.h
index e731547f..de240d3a 100644
--- a/include/rommgr.h
+++ b/include/rommgr.h
@@ -258,7 +258,7 @@ extern void descramble_nordicpro (uae_u8*, int, int);
 extern int kickstart_checksum (uae_u8 *mem, int size);
 extern int decode_rom (uae_u8 *mem, int size, int mode, int real_size);
 extern struct zfile *rom_fopen (const TCHAR *name, const TCHAR *mode, int mask);
-extern struct zfile *read_rom_name_guess (const TCHAR *filename);
+extern struct zfile *read_rom_name_guess (const TCHAR *filename, TCHAR *out);
 extern void addkeydir (const TCHAR *path);
 extern void addkeyfile (const TCHAR *path);
 extern int romlist_count (void);
diff --git a/memory.cpp b/memory.cpp
index cdb7259d..ce6ca6f5 100644
--- a/memory.cpp
+++ b/memory.cpp
@@ -1689,8 +1689,9 @@ static struct zfile *get_kickstart_filehandle(struct uae_prefs *p)
 					if (f == NULL) {
 						_stprintf(tmprom2, _T("%s../System/rom/kick.rom"), start_path_data);
 						f = rom_fopen(tmprom2, _T("rb"), ZFD_NORMAL);
-						if (f == NULL)
-							f = read_rom_name_guess(tmprom);
+						if (f == NULL) {
+							f = read_rom_name_guess(tmprom, tmprom2);
+						}
 					}
 				}
 			}
diff --git a/rommgr.cpp b/rommgr.cpp
index a6320646..c68853c6 100644
--- a/rommgr.cpp
+++ b/rommgr.cpp
@@ -1999,7 +1999,7 @@ struct zfile *read_rom_name (const TCHAR *filename)
 	return f;
 }
 
-struct zfile *read_rom_name_guess (const TCHAR *filename)
+struct zfile *read_rom_name_guess (const TCHAR *filename, TCHAR *out)
 {
 	int i, j;
 	struct zfile *f;
@@ -2026,6 +2026,7 @@ struct zfile *read_rom_name_guess (const TCHAR *filename)
 			f = read_rom (rd);
 			if (f) {
 				write_log (_T("ROM %s not found, using %s\n"), filename, rl[i].path);
+				_tcscpy(out, rl[i].path);
 				return f;
 			}
 		}