From c161e13235eb9a829c9a47711a386444b4b6857e Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Wed, 22 Aug 2018 21:36:02 +0300 Subject: [PATCH] Fix weird ROM path if KS ROM is not found. --- memory.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/memory.cpp b/memory.cpp index 2d184a4e..c9169ad9 100644 --- a/memory.cpp +++ b/memory.cpp @@ -1673,30 +1673,32 @@ static struct zfile *get_kickstart_filehandle(struct uae_prefs *p) f = read_rom_name(p->romfile); _tcscpy(tmprom, p->romfile); + _tcscpy(tmprom2, p->romfile); if (f == NULL) { _stprintf(tmprom2, _T("%s%s"), start_path_data, p->romfile); f = rom_fopen(tmprom2, _T("rb"), ZFD_NORMAL); if (f == NULL) { - _stprintf(p->romfile, _T("%sroms/kick.rom"), start_path_data); - f = rom_fopen(p->romfile, _T("rb"), ZFD_NORMAL); + _stprintf(tmprom2, _T("%sroms/kick.rom"), start_path_data); + f = rom_fopen(tmprom2, _T("rb"), ZFD_NORMAL); if (f == NULL) { - _stprintf(p->romfile, _T("%skick.rom"), start_path_data); - f = rom_fopen(p->romfile, _T("rb"), ZFD_NORMAL); + _stprintf(tmprom2, _T("%skick.rom"), start_path_data); + f = rom_fopen(tmprom2, _T("rb"), ZFD_NORMAL); if (f == NULL) { - _stprintf(p->romfile, _T("%s../shared/rom/kick.rom"), start_path_data); - f = rom_fopen(p->romfile, _T("rb"), ZFD_NORMAL); + _stprintf(tmprom2, _T("%s../shared/rom/kick.rom"), start_path_data); + f = rom_fopen(tmprom2, _T("rb"), ZFD_NORMAL); if (f == NULL) { - _stprintf(p->romfile, _T("%s../System/rom/kick.rom"), start_path_data); - f = rom_fopen(p->romfile, _T("rb"), ZFD_NORMAL); + _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); } } } - } else { - _tcscpy(p->romfile, tmprom2); } } + if (f) { + _tcscpy(p->romfile, tmprom2); + } return f; } -- 2.47.3