fix close before fd handler del's
authorraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 30 Jul 2010 02:50:50 +0000 (02:50 +0000)
committerraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 30 Jul 2010 02:50:50 +0000 (02:50 +0000)
git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@50670 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/ecore_directfb/ecore_directfb.c
src/lib/ecore_fb/ecore_fb_kbd.c
src/lib/ecore_fb/ecore_fb_ts.c

index d305c11..7fa61ef 100644 (file)
@@ -639,10 +639,10 @@ ecore_directfb_window_fullscreen_set(Ecore_DirectFB_Window *ecore_window, int on
        }
        else
        {
+               ecore_main_fd_handler_del(_input_event_fd_handler_handle);
                DFBCHECK(_input_event->Release(_input_event));  
                DFBCHECK(_layer->SetCooperativeLevel(_layer,DLSCL_SHARED));
                DFBCHECK(ecore_window->window->GetSurface(ecore_window->window, &ecore_window->surface));
-               ecore_main_fd_handler_del(_input_event_fd_handler_handle);
                _ecore_directfb_fullscreen_window_id = 0;
        }
                
index 91f2ac1..aa8190e 100644 (file)
@@ -293,9 +293,9 @@ ecore_fb_kbd_init(void)
 void
 ecore_fb_kbd_shutdown(void)
 {
-   if (_ecore_fb_kbd_fd >= 0) close(_ecore_fb_kbd_fd);
    if (_ecore_fb_kbd_fd_handler_handle) 
      ecore_main_fd_handler_del(_ecore_fb_kbd_fd_handler_handle);
+   if (_ecore_fb_kbd_fd >= 0) close(_ecore_fb_kbd_fd);
    _ecore_fb_kbd_fd = 0;
    _ecore_fb_kbd_fd_handler_handle = NULL;
    _ecore_fb_ctrl = 0;
index 4d002a2..be08da6 100644 (file)
@@ -130,9 +130,9 @@ ecore_fb_ts_init(void)
 EAPI void
 ecore_fb_ts_shutdown(void)
 {
-   if (_ecore_fb_ts_fd >= 0) close(_ecore_fb_ts_fd);
    if (_ecore_fb_ts_fd_handler_handle)
      ecore_main_fd_handler_del(_ecore_fb_ts_fd_handler_handle);
+   if (_ecore_fb_ts_fd >= 0) close(_ecore_fb_ts_fd);
    _ecore_fb_ts_fd = -1;
    _ecore_fb_ts_fd_handler_handle = NULL;
 }