del x fd handler before close.
authorraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 30 Jul 2010 02:44:43 +0000 (02:44 +0000)
committerraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 30 Jul 2010 02:44:43 +0000 (02:44 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@50669 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/ecore_x/xcb/ecore_xcb.c
src/lib/ecore_x/xlib/ecore_x.c

index f4f5996..946dc4a 100644 (file)
@@ -677,13 +677,13 @@ _ecore_x_shutdown(int close_display)
 
    if (!_ecore_xcb_conn) return _ecore_xcb_init_count;
 
+   ecore_main_fd_handler_del(_ecore_xcb_fd_handler_handle);
    if (close_display)
       xcb_disconnect(_ecore_xcb_conn);
    else
       close(xcb_get_file_descriptor(_ecore_xcb_conn));
    ecore_event_shutdown();
    free(_ecore_xcb_event_handlers);
-   ecore_main_fd_handler_del(_ecore_xcb_fd_handler_handle);
    ecore_event_filter_del(_ecore_xcb_filter_handler);
    _ecore_xcb_fd_handler_handle = NULL;
    _ecore_xcb_filter_handler = NULL;
index 486f64d..999c197 100644 (file)
@@ -669,13 +669,13 @@ _ecore_x_shutdown(int close_display)
      }
 
 #endif
+   ecore_main_fd_handler_del(_ecore_x_fd_handler_handle);
    if (close_display)
       XCloseDisplay(_ecore_x_disp);
    else
       close(ConnectionNumber(_ecore_x_disp));
 
    free(_ecore_x_event_handlers);
-   ecore_main_fd_handler_del(_ecore_x_fd_handler_handle);
    _ecore_x_fd_handler_handle = NULL;
    _ecore_x_disp = NULL;
    _ecore_x_event_handlers = NULL;