claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the crash after selecting PCap in Settings when previously the network type was not set to PCap;

Browse Source 
Properly fixed reset_menus() in win.c.
This commit is contained in:
OBattler
2017-08-22 14:43:59 +02:00
parent 1293bf1dce
commit 644e57c9e3
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NETWORK/net_pcap.c
View File

@@ -262,6 +262,7 @@ network_pcap_close(void)
/* OK, now shut down WinPcap itself. */
f_pcap_close(pc);
pc = pcap = NULL;
/* Unload the DLL if possible. */
if (pcap_handle != NULL) {
@@ -279,6 +280,7 @@ network_pcap_stop(void)
{
/* OK, now shut down WinPcap itself. */
f_pcap_close(pcap);
pcap = NULL;
/* Unload the DLL if possible. */
if (pcap_handle != NULL) {

14
src/WIN/win.c
View File

@@ -1466,26 +1466,26 @@ void reset_menus(void)
{
#ifdef ENABLE_LOG_TOGGLES
# ifdef ENABLE_BUSLOGIC_LOG
CheckMenuItem(menu, IDM_LOG_BUSLOGIC, buslogic_do_log ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_LOG_BUSLOGIC, MF_UNCHECKED);
# endif
# ifdef ENABLE_CDROM_LOG
CheckMenuItem(menu, IDM_LOG_CDROM, cdrom_do_log ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_LOG_CDROM, MF_UNCHECKED);
# endif
# ifdef ENABLE_D86F_LOG
CheckMenuItem(menu, IDM_LOG_D86F, d86f_do_log ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_LOG_D86F, MF_UNCHECKED);
# endif
# ifdef ENABLE_FDC_LOG
CheckMenuItem(menu, IDM_LOG_FDC, fdc_do_log ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_LOG_FDC, MF_UNCHECKED);
# endif
# ifdef ENABLE_IDE_LOG
CheckMenuItem(menu, IDM_LOG_IDE, ide_do_log ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_LOG_IDE, MF_UNCHECKED);
# endif
# ifdef ENABLE_SERIAL_LOG
CheckMenuItem(menu, IDM_LOG_SERIAL, serial_do_log ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_LOG_SERIAL, MF_UNCHECKED);
# endif
# ifdef ENABLE_NIC_LOG
/*FIXME: should be network_setlog(1:0) */
CheckMenuItem(menu, IDM_LOG_NIC, nic_do_log ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_LOG_NIC, MF_UNCHECKED);
# endif
#endif