diff options
| author | Martin Wehner <martin.wehner@epost.de> | 2004-06-02 18:50:31 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2004-06-02 18:50:31 +0000 |
| commit | f3bf84132a5eb366eaac327eae4eb08e69819b8a (patch) | |
| tree | bb37b0f54c49243f5f3a615ec0e80d7c8366cf4d | |
| parent | 0ca0277275be9f93eb687fa2dfb8ceee24a22f0e (diff) | |
| download | nautilus-f3bf84132a5eb366eaac327eae4eb08e69819b8a.tar.gz | |
Remove directory monitor after cancelling the callbacks. Fixes a rare
2004-06-02 Martin Wehner <martin.wehner@epost.de>
* src/file-manager/fm-directory-view.c:
(disconnect_model_handlers):
Remove directory monitor after cancelling the callbacks.
Fixes a rare crash during list view destruction (#143561).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2004-06-02 Martin Wehner <martin.wehner@epost.de> + + * src/file-manager/fm-directory-view.c: + (disconnect_model_handlers): + Remove directory monitor after cancelling the callbacks. + Fixes a rare crash during list view destruction (#143561). + 2004-06-01 Dave Camp <dave@novell.com> * src/nautilus-window-manage-views.c: (open_location): If diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index c92f6033c..cd097ee76 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -6600,14 +6600,14 @@ disconnect_model_handlers (FMDirectoryView *view) disconnect_directory_handler (view, &view->details->done_loading_handler_id); disconnect_directory_handler (view, &view->details->load_error_handler_id); disconnect_directory_as_file_handler (view, &view->details->file_changed_handler_id); - nautilus_directory_file_monitor_remove (view->details->model, - &view->details->model); nautilus_file_cancel_call_when_ready (view->details->directory_as_file, metadata_for_directory_as_file_ready_callback, view); nautilus_directory_cancel_callback (view->details->model, metadata_for_files_in_directory_ready_callback, view); + nautilus_directory_file_monitor_remove (view->details->model, + &view->details->model); nautilus_file_monitor_remove (view->details->directory_as_file, &view->details->directory_as_file); } |