[gnome-commander] Better error handling in enumerate_children_callback()



commit a2b8239d600e05b4933c4e0c123e8a7d61a12a5f
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Sun May 16 17:42:38 2021 +0200

    Better error handling in enumerate_children_callback()

 src/dirlist.cc       | 6 ++++--
 src/gnome-cmd-dir.cc | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/dirlist.cc b/src/dirlist.cc
index 00f57399..e740e56d 100644
--- a/src/dirlist.cc
+++ b/src/dirlist.cc
@@ -163,15 +163,17 @@ static void enumerate_children_callback(GObject *direnum, GAsyncResult *result,
 
     if( error )
     {
-        g_critical("Unable to add files to list, error: %s", error->message);
+        g_critical("Unable to iterate the g_file_enumerator, error: %s", error->message);
+        dir->state = GnomeCmdDir::STATE_EMPTY;
         g_object_unref(direnum);
+        dir->done_func (dir, dir->gFileInfoList, dir->list_result);
         g_error_free(error);
         return;
     }
     else if( gFileInfosList == nullptr )
     {
         /* DONE */
-        dir->state = dir->list_result==GNOME_VFS_OK ? GnomeCmdDir::STATE_LISTED : GnomeCmdDir::STATE_EMPTY;
+        dir->state = GnomeCmdDir::STATE_LISTED;
         dir->done_func (dir, dir->gFileInfoList, dir->list_result);
         g_object_unref(direnum);
         return;
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index 2a45cb67..9968eaa9 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -531,7 +531,6 @@ static void on_list_done (GnomeCmdDir *dir, GList *infolist, GnomeVFSResult resu
         if (!dir->priv->file_collection->empty())
             dir->priv->file_collection->clear();
 
-        //dir->priv->files = create_file_list (dir, infolist);
         dir->priv->files = create_gnome_cmd_file_list_from_gfileinfo_list (dir, infolist);
         dir->priv->file_collection->add(dir->priv->files);
         g_list_free (infolist);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]