From 25605859e48cffbf5f7b561d172be45b9b7b0e61 Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@feb19cf6-d755-11dd-8179-53c65a4d6d95>
Date: Sun, 21 Feb 2010 06:52:43 +0000
Subject: [PATCH] Really fix the networking joystick issue, networking seems to
 work well now

---
 Src/C64_SDL.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Src/C64_SDL.h b/Src/C64_SDL.h
index d4db79f..b6cda02 100644
--- a/Src/C64_SDL.h
+++ b/Src/C64_SDL.h
@@ -273,6 +273,14 @@ void C64::VBlank(bool draw_frame)
 		TheCIA1->Joystick1 = which;
 		TheCIA1->Joystick2 = which;
 	}
+	else if (this->network_connection_type == MASTER)
+	{
+		/* The other comes from the network */
+		if (ThePrefs.JoystickSwap)
+			TheCIA1->Joystick1 = j1;
+		else
+			TheCIA1->Joystick2 = j2;
+	}
 	else
 	{
 		TheCIA1->Joystick1 = j1;