From 19a691e68d515cde021e66b115a1ab92f4b9881b Mon Sep 17 00:00:00 2001
From: dborth <dborth@d154fe42-be53-0410-aac0-356034171556>
Date: Sat, 17 Apr 2010 03:05:03 +0000
Subject: [PATCH] small fixes

---
 source/input.cpp    | 6 +++++-
 source/snes9xgx.cpp | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/source/input.cpp b/source/input.cpp
index 98784be..a713201 100644
--- a/source/input.cpp
+++ b/source/input.cpp
@@ -266,6 +266,9 @@ SetupPads()
  ***************************************************************************/
 void ShutoffRumble()
 {
+	if(CONF_GetPadMotorMode() == 0)
+		return;
+
 	for(int i=0;i<4;i++)
 	{
 		WPAD_Rumble(i, 0);
@@ -279,7 +282,8 @@ 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
diff --git a/source/snes9xgx.cpp b/source/snes9xgx.cpp
index 1730d62..4e138c4 100644
--- a/source/snes9xgx.cpp
+++ b/source/snes9xgx.cpp
@@ -145,11 +145,13 @@ void ExitApp()
 #ifdef HW_RVL
 void ShutdownCB()
 {
-	ShutdownRequested = 1;
+	if(!inNetworkInit)
+		ShutdownRequested = 1;
 }
 void ResetCB()
 {
-	ResetRequested = 1;
+	if(!inNetworkInit)
+		ResetRequested = 1;
 }
 #endif