From 38a9c9e5765fa6b1a051b787031d2cb48e1c1b15 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 20 Sep 2010 15:02:02 +0200 Subject: list-view: check for model != NULL before unsetting the highlight The model could be NULL there as a result of the view being previously disposed. --- src/file-manager/fm-list-view.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index d01af6ad6..3f599591d 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -2952,6 +2952,13 @@ list_view_notify_clipboard_info (NautilusClipboardMonitor *monitor, NautilusClipboardInfo *info, FMListView *view) { + /* this could be called as a result of _end_loading() being + * called after _dispose(), where the model is cleared. + */ + if (view->details->model == NULL) { + return; + } + if (info != NULL && info->cut) { fm_list_model_set_highlight_for_files (view->details->model, info->files); } else { -- cgit v1.2.1