diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2019-04-01 17:19:32 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2019-04-01 17:19:32 +0000 |
| commit | 18c7701f2f088e77601cfe4601e410ddf9794cdf (patch) | |
| tree | 91066fa734acea9a149e1f7b9d6bede4eb7ee682 | |
| parent | c1a57a038d18f69e5130f6c3b978384c010f5b7c (diff) | |
| parent | 465b8031d0a73ac775952c07d0374206746a8a46 (diff) | |
| download | tracker-18c7701f2f088e77601cfe4601e410ddf9794cdf.tar.gz | |
Merge branch 'fix-lp-1822629' into 'master'
tracker-miner: Fix cancellation of g_file_enumerator_next_files_async
Closes #86
See merge request GNOME/tracker!86
| -rw-r--r-- | src/libtracker-miner/tracker-crawler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c index 1b8319d97..bfad387c6 100644 --- a/src/libtracker-miner/tracker-crawler.c +++ b/src/libtracker-miner/tracker-crawler.c @@ -903,7 +903,7 @@ enumerate_next_cb (GObject *object, { DataProviderData *dpd; GList *info; - GError *error = NULL; + g_autoptr(GError) error = NULL; info = g_file_enumerator_next_files_finish (G_FILE_ENUMERATOR (object), result, &error); dpd = user_data; @@ -922,9 +922,9 @@ enumerate_next_cb (GObject *object, g_warning ("Could not enumerate next item in container / directory '%s', %s", uri, error ? error->message : "no error given"); g_free (uri); + } else { + return; } - - g_clear_error (&error); } else { /* Done enumerating, start processing what we got ... */ data_provider_data_add (dpd); |