From c11da593199bb3b3e23c92e155c62b1cbf665f87 Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Sat, 17 Apr 2010 03:04:21 +0000
Subject: [PATCH] small fixes

---
 source/fceugx.cpp | 6 ++++--
 source/pad.cpp    | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/source/fceugx.cpp b/source/fceugx.cpp
index cfba211..a1943f7 100644
--- a/source/fceugx.cpp
+++ b/source/fceugx.cpp
@@ -152,11 +152,13 @@ void ExitApp()
 #ifdef HW_RVL
 void ShutdownCB()
 {
-	ShutdownRequested = 1;
+	if(!inNetworkInit)
+		ShutdownRequested = 1;
 }
 void ResetCB()
 {
-	ResetRequested = 1;
+	if(!inNetworkInit)
+		ResetRequested = 1;
 }
 #endif
 
diff --git a/source/pad.cpp b/source/pad.cpp
index eafe5bf..3697934 100644
--- a/source/pad.cpp
+++ b/source/pad.cpp
@@ -256,6 +256,9 @@ SetupPads()
 
 void ShutoffRumble()
 {
+	if(CONF_GetPadMotorMode() == 0)
+		return;
+
 	for(int i=0;i<4;i++)
 	{
 		WPAD_Rumble(i, 0);
@@ -270,7 +273,9 @@ void ShutoffRumble()
 
 void DoRumble(int i)
 {
-	if(!GCSettings.Rumble) return;
+	if(CONF_GetPadMotorMode() == 0 || !GCSettings.Rumble)
+		return;
+
 	if(rumbleRequest[i] && rumbleCount[i] < 3)
 	{
 		WPAD_Rumble(i, 1); // rumble on