From 014b5c667192e6d6ddd4b3999f43a396dd905d45 Mon Sep 17 00:00:00 2001
From: mattmenke <mattmenke@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sun, 5 Apr 2009 18:37:06 +0000
Subject: [PATCH] LilyPad:  Fixed "Swap with Pad 1"

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@914 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/LilyPad/Config.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp
index 99769d6c85..39e9e30ad1 100644
--- a/plugins/LilyPad/Config.cpp
+++ b/plugins/LilyPad/Config.cpp
@@ -1867,7 +1867,7 @@ INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, L
 								InsertMenuItemW(hMenu, index, 1, &info);
 							}
 							else {
-								info.wID = port2+2*slot2;
+								info.wID = port2+2*slot2+1;
 								wsprintfW(text, L"Swap with %s", pad);
 								InsertMenuItemW(hMenu, 0, 1, &info);
 							}
@@ -1879,6 +1879,7 @@ INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, L
 					DestroyMenu(hMenu);
 					if (!res) break;
 					if (res > 0) {
+						res--;
 						slot2 = res / 2;
 						port2 = res&1;
 						PadConfig padCfgTemp = config.padConfigs[port1][slot1];