summaryrefslogtreecommitdiff
path: root/src/lib/ecore_psl1ght
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-03-09 16:13:13 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-03-09 16:17:58 -0800
commitb7d8f7bdd3ce16dfc08d54b9edfee66fc34c87c0 (patch)
tree90fe74e6692b1e4b518f5bbf79e7e692a2f1205c /src/lib/ecore_psl1ght
parent988344f3e5c4d6ed2a56e8767ce435a54efd0948 (diff)
ecore_psl1ght: avoid crash during shutdown due to Ecore_Event queue.
Diffstat (limited to 'src/lib/ecore_psl1ght')
-rw-r--r--src/lib/ecore_psl1ght/ecore_psl1ght.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/lib/ecore_psl1ght/ecore_psl1ght.c b/src/lib/ecore_psl1ght/ecore_psl1ght.c
index adc0595432..1a16145728 100644
--- a/src/lib/ecore_psl1ght/ecore_psl1ght.c
+++ b/src/lib/ecore_psl1ght/ecore_psl1ght.c
@@ -147,11 +147,14 @@ ecore_psl1ght_init(const char *name EINA_UNUSED)
147 147
148 sysUtilRegisterCallback (SYSUTIL_EVENT_SLOT0, xmb_event_handler, NULL); 148 sysUtilRegisterCallback (SYSUTIL_EVENT_SLOT0, xmb_event_handler, NULL);
149 149
150 ECORE_PSL1GHT_EVENT_GOT_FOCUS = ecore_event_type_new(); 150 if (ECORE_PSL1GHT_EVENT_GOT_FOCUS == 0)
151 ECORE_PSL1GHT_EVENT_LOST_FOCUS = ecore_event_type_new(); 151 {
152 ECORE_PSL1GHT_EVENT_EXPOSE = ecore_event_type_new(); 152 ECORE_PSL1GHT_EVENT_GOT_FOCUS = ecore_event_type_new();
153 ECORE_PSL1GHT_EVENT_KEY_MODIFIERS = ecore_event_type_new(); 153 ECORE_PSL1GHT_EVENT_LOST_FOCUS = ecore_event_type_new();
154 ECORE_PSL1GHT_EVENT_QUIT = ecore_event_type_new(); 154 ECORE_PSL1GHT_EVENT_EXPOSE = ecore_event_type_new();
155 ECORE_PSL1GHT_EVENT_KEY_MODIFIERS = ecore_event_type_new();
156 ECORE_PSL1GHT_EVENT_QUIT = ecore_event_type_new();
157 }
155 158
156 mouse_x = 0; 159 mouse_x = 0;
157 mouse_y = 0; 160 mouse_y = 0;
@@ -175,11 +178,11 @@ ecore_psl1ght_shutdown(void)
175 eina_log_domain_unregister(_ecore_psl1ght_log_dom); 178 eina_log_domain_unregister(_ecore_psl1ght_log_dom);
176 _ecore_psl1ght_log_dom = -1; 179 _ecore_psl1ght_log_dom = -1;
177 180
178 ECORE_PSL1GHT_EVENT_GOT_FOCUS = 0; 181 ecore_event_type_flush(ECORE_PSL1GHT_EVENT_GOT_FOCUS,
179 ECORE_PSL1GHT_EVENT_LOST_FOCUS = 0; 182 ECORE_PSL1GHT_EVENT_LOST_FOCUS,
180 ECORE_PSL1GHT_EVENT_EXPOSE = 0; 183 ECORE_PSL1GHT_EVENT_EXPOSE,
181 ECORE_PSL1GHT_EVENT_KEY_MODIFIERS = 0; 184 ECORE_PSL1GHT_EVENT_KEY_MODIFIERS,
182 ECORE_PSL1GHT_EVENT_QUIT = 0; 185 ECORE_PSL1GHT_EVENT_QUIT);
183 186
184 ioPadEnd(); 187 ioPadEnd();
185 ioMouseEnd(); 188 ioMouseEnd();