claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logitech bus mouse now identifies correctly in Settings;

Browse Source 
Serial mouse initialization now sets up rcr_callback_p, fixes emulator segmentation fault on CuteMouse load.
This commit is contained in:
OBattler
2017-08-04 15:18:38 +02:00
parent 374943f4f5
commit f8a92d0165
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WIN/86Box.rc
View File

@@ -843,7 +843,7 @@ BEGIN
IDS_2170 "Check BPB" IDS_2170 "Check BPB"
IDS_3072 "None" IDS_3072 "None"
IDS_3073 "[Bus] Bus mouse" IDS_3073 "[Bus] Logitech Bus mouse"
IDS_3074 "[Bus] InPort mouse" IDS_3074 "[Bus] InPort mouse"
IDS_3075 "[Serial] Mouse Systems mouse" IDS_3075 "[Serial] Mouse Systems mouse"
IDS_3076 "[Serial] Microsoft 2-button mouse" IDS_3076 "[Serial] Microsoft 2-button mouse"

1
src/mouse_serial.c
View File

@@ -224,6 +224,7 @@ sermouse_init(int type)
#else #else
ms->serial = &serial1; ms->serial = &serial1;
ms->serial->rcr_callback = sermouse_callback; ms->serial->rcr_callback = sermouse_callback;
ms->serial->rcr_callback_p = ms;
#endif #endif
timer_add(sermouse_timer, &ms->delay, &ms->delay, ms); timer_add(sermouse_timer, &ms->delay, &ms->delay, ms);