del x fd handler before close.

SVN revision: 50669
This commit is contained in:
Carsten Haitzler 2010-07-30 02:44:43 +00:00
parent 24bf638323
commit bdce85e21c
2 changed files with 2 additions and 2 deletions

View 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;

View 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;