80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Improve pcap errors

Browse Source
This commit is contained in:
RichardG867
2020-06-18 21:20:10 -03:00
parent 62724cda1f
commit a5e14f2ae7
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@@ -713,9 +713,9 @@ load_network(void)
if (p != NULL) { if (p != NULL) {
if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) { if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) {
if ((network_ndev == 1) && strcmp(network_host, "none")) { if ((network_ndev == 1) && strcmp(network_host, "none")) {
ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2094); ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2094, (wchar_t *) IDS_2129);
} else if (network_dev_to_id(p) == -1) { } else if (network_dev_to_id(p) == -1) {
ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2095); ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2095, (wchar_t *) IDS_2129);
} }
strcpy(network_host, "none"); strcpy(network_host, "none");

1
src/include/86box/language.h
View File

@@ -102,6 +102,7 @@
#define IDS_2126 2126 // "An emulator of old computers..." #define IDS_2126 2126 // "An emulator of old computers..."
#define IDS_2127 2127 // "OK" #define IDS_2127 2127 // "OK"
#define IDS_2128 2128 // "Hardware not available" #define IDS_2128 2128 // "Hardware not available"
#define IDS_2129 2129 // "Make sure " PCAP " is installed..."
#define IDS_4096 4096 // "Hard disk (%s)" #define IDS_4096 4096 // "Hard disk (%s)"
#define IDS_4097 4097 // "%01i:%01i" #define IDS_4097 4097 // "%01i:%01i"

2
src/network/network.c
View File

@@ -438,7 +438,7 @@ network_reset(void)
if (i < 0) { if (i < 0) {
/* Tell user we can't do this (at the moment.) */ /* Tell user we can't do this (at the moment.) */
ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2093); ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2093, (wchar_t *) IDS_2129);
// FIXME: we should ask in the dialog if they want to // FIXME: we should ask in the dialog if they want to
// reconfigure or quit, and throw them into the // reconfigure or quit, and throw them into the

8
src/win/86Box.rc
View File

@@ -930,7 +930,7 @@ BEGIN
IDS_2090 "Default" IDS_2090 "Default"
IDS_2091 "%i Wait state(s)" IDS_2091 "%i Wait state(s)"
IDS_2092 "Type" IDS_2092 "Type"
IDS_2093 "PCap failed to set up because it may not be initialized" IDS_2093 "Failed to set up PCap"
IDS_2094 "No PCap devices found" IDS_2094 "No PCap devices found"
IDS_2095 "Invalid PCap device" IDS_2095 "Invalid PCap device"
IDS_2096 "Standard 2-button joystick(s)" IDS_2096 "Standard 2-button joystick(s)"
@@ -966,6 +966,12 @@ BEGIN
IDS_2126 "An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information." IDS_2126 "An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information."
IDS_2127 "OK" IDS_2127 "OK"
IDS_2128 "Hardware not available" IDS_2128 "Hardware not available"
#ifdef _WIN32
#define PCAP "WinPcap"
#else
#define PCAP "libpcap"
#endif
IDS_2129 "Make sure " PCAP " is installed and that you are on a " PCAP "-compatible network connection."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE