summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@epost.de>2004-06-02 18:37:45 +0000
committerMartin Wehner <mwehner@src.gnome.org>2004-06-02 18:37:45 +0000
commit032660ca5d75c4d74ffdace5860c9123ad940ff3 (patch)
treeaeb6efc66b65f59af84fce97b3d34f96b58b78fc /src
parent5b92a1a1a2cd715f3898ab6bac362a1f1ff11fec (diff)
downloadnautilus-032660ca5d75c4d74ffdace5860c9123ad940ff3.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).
Diffstat (limited to 'src')
-rw-r--r--src/file-manager/fm-directory-view.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index b770a5594..392122dc9 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -6606,14 +6606,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);
}