From 644e57c9e3a61ae13e133d2cab81cfa9ecb4f593 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 22 Aug 2017 14:43:59 +0200
Subject: [PATCH] Fixed the crash after selecting PCap in Settings when
 previously the network type was not set to PCap; Properly fixed reset_menus()
 in win.c.

---
 src/NETWORK/net_pcap.c |  2 ++
 src/WIN/win.c          | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/NETWORK/net_pcap.c b/src/NETWORK/net_pcap.c
index 3bab8fe41..21e2bac56 100644
--- a/src/NETWORK/net_pcap.c
+++ b/src/NETWORK/net_pcap.c
@@ -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) {
diff --git a/src/WIN/win.c b/src/WIN/win.c
index 055233f97..7ac7c1f8b 100644
--- a/src/WIN/win.c
+++ b/src/WIN/win.c
@@ -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