Revision b2d4d832 hw/usb-wacom.c

b/hw/usb-wacom.c
160 160
    if (!s->mouse_grabbed) {
161 161
        s->eh_entry = qemu_add_mouse_event_handler(usb_mouse_event, s, 0,
162 162
                        "QEMU PenPartner tablet");
163
        qemu_activate_mouse_event_handler(s->eh_entry);
163 164
        s->mouse_grabbed = 1;
164 165
    }
165 166

  
......
197 198
    if (!s->mouse_grabbed) {
198 199
        s->eh_entry = qemu_add_mouse_event_handler(usb_wacom_event, s, 1,
199 200
                        "QEMU PenPartner tablet");
201
        qemu_activate_mouse_event_handler(s->eh_entry);
200 202
        s->mouse_grabbed = 1;
201 203
    }
202 204

  
......
334 336
        ret = 0;
335 337
        break;
336 338
    case WACOM_SET_REPORT:
337
        qemu_remove_mouse_event_handler(s->eh_entry);
338
        s->mouse_grabbed = 0;
339
        if (s->mouse_grabbed) {
340
            qemu_remove_mouse_event_handler(s->eh_entry);
341
            s->mouse_grabbed = 0;
342
        }
339 343
        s->mode = data[0];
340 344
        ret = 0;
341 345
        break;
......
397 401
{
398 402
    USBWacomState *s = (USBWacomState *) dev;
399 403

  
400
    qemu_remove_mouse_event_handler(s->eh_entry);
404
    if (s->mouse_grabbed) {
405
        qemu_remove_mouse_event_handler(s->eh_entry);
406
        s->mouse_grabbed = 0;
407
    }
401 408
}
402 409

  
403 410
static int usb_wacom_initfn(USBDevice *dev)

Also available in: Unified diff