From 0d4ee5582492b5b0c23746266c703df17e985d5b Mon Sep 17 00:00:00 2001
From: Brandon Wright <bearoso@gmail.com>
Date: Sat, 9 Mar 2019 18:18:01 -0600
Subject: [PATCH] Fix problems with pull request.

---
 controls.cpp          | 4 +++-
 win32/snes9xw.vcxproj | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/controls.cpp b/controls.cpp
index bc5aa1a8..58364eab 100644
--- a/controls.cpp
+++ b/controls.cpp
@@ -2442,7 +2442,8 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 							S9xSetInfoString("Cannot swap pads: port 2 is not a joypad");
 							break;
 						}
-						
+
+#ifdef NETPLAY_SUPPORT
 						if (Settings.NetPlay && data2 != 1) { //data2 == 1 means it's sent by the netplay code
 							if (Settings.NetPlayServer) {
 								S9xNPSendJoypadSwap();
@@ -2451,6 +2452,7 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
 								break;
 							}
 						}
+#endif
 
 						newcontrollers[1] = curcontrollers[0];
 						newcontrollers[0] = curcontrollers[1];
diff --git a/win32/snes9xw.vcxproj b/win32/snes9xw.vcxproj
index a784a655..d55881e0 100644
--- a/win32/snes9xw.vcxproj
+++ b/win32/snes9xw.vcxproj
@@ -96,7 +96,6 @@
     <IntDir>$(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\</IntDir>
     <TargetName>$(ProjectName)</TargetName>
     <IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
-    <IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)\include</IncludePath>
     <LibraryPath>$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
@@ -742,4 +741,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>