From 96fb867f9f869cef05670243b492296b90a0a399 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Sun, 11 Feb 2018 10:03:57 -0500
Subject: [PATCH] PSX movie import: Fix copy-paste error Partial Fix, buttons
 still don't line up but getting closer.

---
 BizHawk.Client.Common/movie/import/PJMImport.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/movie/import/PJMImport.cs b/BizHawk.Client.Common/movie/import/PJMImport.cs
index 6c997698cc..0ced2f3f15 100644
--- a/BizHawk.Client.Common/movie/import/PJMImport.cs
+++ b/BizHawk.Client.Common/movie/import/PJMImport.cs
@@ -121,13 +121,13 @@ namespace BizHawk.Client.Common
 			{
 				case 0:
 				case 8:
-					info.Player1Type = OctoshockDll.ePeripheralType.None;
+					info.Player2Type = OctoshockDll.ePeripheralType.None;
 					break;
 				case 4:
-					info.Player1Type = OctoshockDll.ePeripheralType.Pad;
+					info.Player2Type = OctoshockDll.ePeripheralType.Pad;
 					break;
 				case 7:
-					info.Player1Type = OctoshockDll.ePeripheralType.DualShock;
+					info.Player2Type = OctoshockDll.ePeripheralType.DualShock;
 					break;
 				default:
 					Result.Errors.Add("Movie has unrecognised controller type for Player 2.");