summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2010-09-20 15:02:02 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2010-09-27 15:47:25 +0200
commit38a9c9e5765fa6b1a051b787031d2cb48e1c1b15 (patch)
tree027edc87ed2be2e5a7cd6b70279b5cb3c1d77613
parent20bbf811dc309bae3a11374447b43ebad9dc6f6b (diff)
downloadnautilus-38a9c9e5765fa6b1a051b787031d2cb48e1c1b15.tar.gz
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.
-rw-r--r--src/file-manager/fm-list-view.c7
1 files changed, 7 insertions, 0 deletions
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 {