diff options
| author | Cedric BAIL <cedric@osg.samsung.com> | 2017-03-09 16:17:10 -0800 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2017-03-09 16:17:58 -0800 |
| commit | c91b4c70653527546afbc324b94e4ed60cdfd784 (patch) | |
| tree | 6481ff95e5eac80a0781f3fd06b5be78bc0d8a6a | |
| parent | 93b63b48e862c1ee5c217abeede05a5533c96ed7 (diff) | |
| download | efl-c91b4c70653527546afbc324b94e4ed60cdfd784.tar.gz | |
elput: avoid crash during shutdown due to Ecore_Event queue.
| -rw-r--r-- | src/lib/elput/elput.c | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/src/lib/elput/elput.c b/src/lib/elput/elput.c index 561c98addd..f0c7a9027b 100644 --- a/src/lib/elput/elput.c +++ b/src/lib/elput/elput.c @@ -6,13 +6,13 @@ static int _elput_init_count = 0; /* external variables */ int _elput_log_dom = -1; -EAPI int ELPUT_EVENT_SEAT_CAPS = -1; -EAPI int ELPUT_EVENT_SEAT_FRAME = -1; -EAPI int ELPUT_EVENT_KEYMAP_SEND = -1; -EAPI int ELPUT_EVENT_MODIFIERS_SEND = -1; -EAPI int ELPUT_EVENT_DEVICE_CHANGE = -1; -EAPI int ELPUT_EVENT_SESSION_ACTIVE = -1; -EAPI int ELPUT_EVENT_POINTER_MOTION = -1; +EAPI int ELPUT_EVENT_SEAT_CAPS = 0; +EAPI int ELPUT_EVENT_SEAT_FRAME = 0; +EAPI int ELPUT_EVENT_KEYMAP_SEND = 0; +EAPI int ELPUT_EVENT_MODIFIERS_SEND = 0; +EAPI int ELPUT_EVENT_DEVICE_CHANGE = 0; +EAPI int ELPUT_EVENT_SESSION_ACTIVE = 0; +EAPI int ELPUT_EVENT_POINTER_MOTION = 0; EAPI int elput_init(void) @@ -31,13 +31,16 @@ elput_init(void) goto log_err; } - ELPUT_EVENT_SEAT_CAPS = ecore_event_type_new(); - ELPUT_EVENT_SEAT_FRAME = ecore_event_type_new(); - ELPUT_EVENT_KEYMAP_SEND = ecore_event_type_new(); - ELPUT_EVENT_MODIFIERS_SEND = ecore_event_type_new(); - ELPUT_EVENT_DEVICE_CHANGE = ecore_event_type_new(); - ELPUT_EVENT_SESSION_ACTIVE = ecore_event_type_new(); - ELPUT_EVENT_POINTER_MOTION = ecore_event_type_new(); + if (ELPUT_EVENT_SEAT_CAPS == 0) + { + ELPUT_EVENT_SEAT_CAPS = ecore_event_type_new(); + ELPUT_EVENT_SEAT_FRAME = ecore_event_type_new(); + ELPUT_EVENT_KEYMAP_SEND = ecore_event_type_new(); + ELPUT_EVENT_MODIFIERS_SEND = ecore_event_type_new(); + ELPUT_EVENT_DEVICE_CHANGE = ecore_event_type_new(); + ELPUT_EVENT_SESSION_ACTIVE = ecore_event_type_new(); + ELPUT_EVENT_POINTER_MOTION = ecore_event_type_new(); + } return _elput_init_count; @@ -59,13 +62,13 @@ elput_shutdown(void) if (_elput_init_count < 1) return 0; if (--_elput_init_count != 0) return _elput_init_count; - ELPUT_EVENT_SEAT_CAPS = -1; - ELPUT_EVENT_SEAT_FRAME = -1; - ELPUT_EVENT_KEYMAP_SEND = -1; - ELPUT_EVENT_MODIFIERS_SEND = -1; - ELPUT_EVENT_DEVICE_CHANGE = -1; - ELPUT_EVENT_SESSION_ACTIVE = -1; - ELPUT_EVENT_POINTER_MOTION = -1; + ecore_event_type_flush(ELPUT_EVENT_SEAT_CAPS, + ELPUT_EVENT_SEAT_FRAME, + ELPUT_EVENT_KEYMAP_SEND, + ELPUT_EVENT_MODIFIERS_SEND, + ELPUT_EVENT_DEVICE_CHANGE, + ELPUT_EVENT_SESSION_ACTIVE, + ELPUT_EVENT_POINTER_MOTION); eina_log_domain_unregister(_elput_log_dom); _elput_log_dom = -1; |