From a3d6e4aa4e71b60f3a58b88869972439e915331a Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 18 Jun 2020 21:23:34 -0300 Subject: [PATCH] Improve MFM/RLL/ESDI CD-ROM error message --- src/disk/hdd.c | 5 +---- src/include/86box/language.h | 1 + src/win/86Box.rc | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/disk/hdd.c b/src/disk/hdd.c index 15bb5743e..f1c0f1599 100644 --- a/src/disk/hdd.c +++ b/src/disk/hdd.c @@ -49,7 +49,7 @@ hdd_string_to_bus(char *str, int cdrom) if (! strcmp(str, "mfm")) { if (cdrom) { no_cdrom: - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_4099); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2130, (wchar_t *) IDS_4099); return(0); } @@ -93,9 +93,6 @@ no_cdrom: if (! strcmp(str, "scsi")) return(HDD_BUS_SCSI); - if (! strcmp(str, "usb")) - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_4110); - return(0); } diff --git a/src/include/86box/language.h b/src/include/86box/language.h index 10a91e07e..9bb707c6b 100644 --- a/src/include/86box/language.h +++ b/src/include/86box/language.h @@ -103,6 +103,7 @@ #define IDS_2127 2127 // "OK" #define IDS_2128 2128 // "Hardware not available" #define IDS_2129 2129 // "Make sure " PCAP " is installed..." +#define IDS_2130 2130 // "Invalid configuration" #define IDS_4096 4096 // "Hard disk (%s)" #define IDS_4097 4097 // "%01i:%01i" diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 25543e05a..ce9747a67 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -972,6 +972,7 @@ BEGIN #define PCAP "libpcap" #endif IDS_2129 "Make sure " PCAP " is installed and that you are on a " PCAP "-compatible network connection." + IDS_2130 "Invalid configuration" END STRINGTABLE DISCARDABLE