From f8420db1aaeb3ed3f6122b379dcc2a1d72093ec4 Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Fri, 14 May 2010 09:29:16 +0000
Subject: Fixed crash when launching another game if netplay plugin is selected
 but not used during the previously running game.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48030 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 libpcsxcore/plugins.c | 4 ++--
 libpcsxcore/psxbios.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libpcsxcore')

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index fba84ee1..b70d4220 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -614,9 +614,9 @@ int LoadPlugins() {
 void ReleasePlugins() {
 	if (Config.UseNet) {
 		int ret = NET_close();
-		if (ret < 0) Config.UseNet = 0;
-		NetOpened = FALSE;
+		if (ret < 0) Config.UseNet = FALSE;
 	}
+	NetOpened = FALSE;
 
 	if (hCDRDriver != NULL || cdrIsoActive()) CDR_shutdown();
 	if (hGPUDriver != NULL) GPU_shutdown();
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 2f49fdf6..ff436252 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -239,8 +239,8 @@ typedef struct {
 
 static u32 *jmp_int = NULL;
 static int *pad_buf = NULL;
-static char *pad_buf1, *pad_buf2;//shadow add
-static int pad_buf1len, pad_buf2len;//shadow add
+static char *pad_buf1 = NULL, *pad_buf2 = NULL;
+static int pad_buf1len, pad_buf2len;
 
 static u32 regs[35];
 static EvCB *Event;
@@ -2239,7 +2239,7 @@ void biosInterrupt() {
 	int i, bufcount;
 
 //	if (psxHu32(0x1070) & 0x1) { // Vsync
-		if (pad_buf) {
+		if (pad_buf != NULL) {
 			u32 *buf = (u32*)pad_buf;
 
 			if (!Config.UseNet) {
@@ -2288,7 +2288,7 @@ void biosInterrupt() {
 					netError();
 			}
 		}
-		if (Config.UseNet && pad_buf1 && pad_buf2) {
+		if (Config.UseNet && pad_buf1 != NULL && pad_buf2 != NULL) {
 			psxBios_PADpoll(1);
 
 			if (NET_sendPadData(pad_buf1, i) == -1)
-- 
cgit v1.2.3