rik/libwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emit a disconnect event again.

Browse Source 
Fixes a regression that prevented disconnect events from being sent.
This commit is contained in:
Johannes Zarl
2013-09-30 15:58:34 +02:00
parent 3708afeb1c
commit bba7fd2c63
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/events.c
View File

@@ -481,7 +481,7 @@ static void event_status(struct wiimote_t* wm, byte* msg) {
struct data_req_t* req = wm->data_req; struct data_req_t* req = wm->data_req;
/* initial handshake is not finished yet, ignore this */ /* initial handshake is not finished yet, ignore this */
if (WIIMOTE_IS_SET(wm, WIIMOTE_STATE_HANDSHAKE)) { if (WIIMOTE_IS_SET(wm, WIIMOTE_STATE_HANDSHAKE) || !msg) {
return; return;
} }

8
src/os_nix.c
View File

@@ -31,6 +31,7 @@
* @brief Handles device I/O for *nix. * @brief Handles device I/O for *nix.
*/ */
#include "wiiuse_internal.h" /* for WM_RPT_CTRL_STATUS */
#include "io.h" #include "io.h"
#include "events.h" #include "events.h"
#include "os.h" #include "os.h"
@@ -304,6 +305,13 @@ int wiiuse_os_poll(struct wiimote_t** wm, int wiimotes) {
/* propagate the event */ /* propagate the event */
propagate_event(wm[i], read_buffer[0], read_buffer + 1); propagate_event(wm[i], read_buffer[0], read_buffer + 1);
evnt += (wm[i]->event != WIIUSE_NONE); evnt += (wm[i]->event != WIIUSE_NONE);
} else if (!WIIMOTE_IS_CONNECTED(wm[i])) {
/* freshly disconnected */
wm[i]->event = (r==0) ? WIIUSE_DISCONNECT : WIIUSE_UNEXPECTED_DISCONNECT;
evnt++;
/* propagate the event:
Emit a controller-status type event. */
propagate_event(wm[i], WM_RPT_CTRL_STATUS, 0);
} }
} else { } else {
/* send out any waiting writes */ /* send out any waiting writes */