forked from enlightenment/efl
parent
24bf638323
commit
bdce85e21c
|
@ -677,13 +677,13 @@ _ecore_x_shutdown(int close_display)
|
||||||
|
|
||||||
if (!_ecore_xcb_conn) return _ecore_xcb_init_count;
|
if (!_ecore_xcb_conn) return _ecore_xcb_init_count;
|
||||||
|
|
||||||
|
ecore_main_fd_handler_del(_ecore_xcb_fd_handler_handle);
|
||||||
if (close_display)
|
if (close_display)
|
||||||
xcb_disconnect(_ecore_xcb_conn);
|
xcb_disconnect(_ecore_xcb_conn);
|
||||||
else
|
else
|
||||||
close(xcb_get_file_descriptor(_ecore_xcb_conn));
|
close(xcb_get_file_descriptor(_ecore_xcb_conn));
|
||||||
ecore_event_shutdown();
|
ecore_event_shutdown();
|
||||||
free(_ecore_xcb_event_handlers);
|
free(_ecore_xcb_event_handlers);
|
||||||
ecore_main_fd_handler_del(_ecore_xcb_fd_handler_handle);
|
|
||||||
ecore_event_filter_del(_ecore_xcb_filter_handler);
|
ecore_event_filter_del(_ecore_xcb_filter_handler);
|
||||||
_ecore_xcb_fd_handler_handle = NULL;
|
_ecore_xcb_fd_handler_handle = NULL;
|
||||||
_ecore_xcb_filter_handler = NULL;
|
_ecore_xcb_filter_handler = NULL;
|
||||||
|
|
|
@ -669,13 +669,13 @@ _ecore_x_shutdown(int close_display)
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
ecore_main_fd_handler_del(_ecore_x_fd_handler_handle);
|
||||||
if (close_display)
|
if (close_display)
|
||||||
XCloseDisplay(_ecore_x_disp);
|
XCloseDisplay(_ecore_x_disp);
|
||||||
else
|
else
|
||||||
close(ConnectionNumber(_ecore_x_disp));
|
close(ConnectionNumber(_ecore_x_disp));
|
||||||
|
|
||||||
free(_ecore_x_event_handlers);
|
free(_ecore_x_event_handlers);
|
||||||
ecore_main_fd_handler_del(_ecore_x_fd_handler_handle);
|
|
||||||
_ecore_x_fd_handler_handle = NULL;
|
_ecore_x_fd_handler_handle = NULL;
|
||||||
_ecore_x_disp = NULL;
|
_ecore_x_disp = NULL;
|
||||||
_ecore_x_event_handlers = NULL;
|
_ecore_x_event_handlers = NULL;
|
||||||
|
|
Loading…
Reference in New Issue