Input remapping fixes.

diff --git a/inputdevice.cpp b/inputdevice.cpp
index f8cde0e50096f3130b63f1fe3b69ce1fbf1e395f..26913eefe98a9398fa4dd44bac3be75dacae75ca 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -7444,7 +7444,7 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
                                                        break;
                                        }
                                } else if (jd->id >= 0) {
-                                       joymodes[i][0] = i ? JSEM_MODE_JOYSTICK : JSEM_MODE_WHEELMOUSE;
+                                       joymodes[i][j] = i ? JSEM_MODE_JOYSTICK : JSEM_MODE_WHEELMOUSE;
                                        joyinputs[i] = i ? ip_joy2 : ip_mouse1;
                                }
                        }

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 5ecdb7ffac92a121b0adf9c984c16ea7e5881721..b2f3fadf355e1208fa1e8f19582b5438644b44a5 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -19039,6 +19039,9 @@ static void CALLBACK timerfunc (HWND hDlg, UINT uMsg, UINT_PTR idEvent, DWORD dw
                                int events[MAX_COMPA_INPUTLIST];
                                
                                int max = inputdevice_get_compatibility_input (&workprefs, inputmap_port, &mode, events, &axistable);
+                               if (inputmap_remap_counter >= max) {
+                                       inputmap_remap_counter = 0;
+                               }
                                int evtnum = events[inputmap_remap_counter];
                                int type2 = intputdevice_compa_get_eventtype (evtnum, &axistable2);