From 516f8ec6a3b588587cc677040caaf4bdb26176f3 Mon Sep 17 00:00:00 2001 From: Alexander Schwinn Date: Tue, 24 Sep 2019 01:16:25 +0200 Subject: [PATCH] Crash on refresh if remote folder has been removed (Bug #15961) --- thunar/thunar-standard-view.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c index 29b89219..b0e0b1d0 100644 --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -1746,11 +1746,24 @@ thunar_standard_view_reload (ThunarView *view, { ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (view); ThunarFolder *folder; + ThunarFolder *file; /* determine the folder for the view model */ folder = thunar_list_model_get_folder (standard_view->model); if (G_LIKELY (folder != NULL)) - thunar_folder_reload (folder, reload_info); + { + file = thunar_folder_get_corresponding_file (folder); + if (thunar_file_exists (file)) + thunar_folder_reload (folder, reload_info); + else + { + printf("does not exists any more\n"); + // TODO Check: What if parent as well does not exist any more ? + // TODO: Update location buttons if folder got removed + thunar_navigator_change_directory (view, thunar_file_get_parent (file, NULL)); + folder = thunar_list_model_get_folder (standard_view->model); + } + } /* schedule thumbnail reload update */ if (!standard_view->priv->thumbnailing_scheduled) -- 2.23.0