From f8a92d0165f97f72aeb0eb6ea50b0134df41cd73 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 4 Aug 2017 15:18:38 +0200
Subject: [PATCH] Logitech bus mouse now identifies correctly in Settings;
 Serial mouse initialization now sets up rcr_callback_p, fixes emulator
 segmentation fault on CuteMouse load.

---
 src/WIN/86Box.rc   | 2 +-
 src/mouse_serial.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/WIN/86Box.rc b/src/WIN/86Box.rc
index 05381bd48..776fd8350 100644
--- a/src/WIN/86Box.rc
+++ b/src/WIN/86Box.rc
@@ -843,7 +843,7 @@ BEGIN
     IDS_2170	"Check BPB"
 
     IDS_3072    "None"
-    IDS_3073	"[Bus] Bus mouse"
+    IDS_3073	"[Bus] Logitech Bus mouse"
     IDS_3074	"[Bus] InPort mouse"
     IDS_3075	"[Serial] Mouse Systems mouse"
     IDS_3076	"[Serial] Microsoft 2-button mouse"
diff --git a/src/mouse_serial.c b/src/mouse_serial.c
index d2446c3a3..422de2045 100644
--- a/src/mouse_serial.c
+++ b/src/mouse_serial.c
@@ -224,6 +224,7 @@ sermouse_init(int type)
 #else
     ms->serial = &serial1;
     ms->serial->rcr_callback = sermouse_callback;
+    ms->serial->rcr_callback_p = ms;
 #endif
 
     timer_add(sermouse_timer, &ms->delay, &ms->delay, ms);