diff options
| author | Carlos Garnacho <mrgarnacho@gmail.com> | 2020-03-04 10:07:46 +0000 |
|---|---|---|
| committer | Carlos Garnacho <mrgarnacho@gmail.com> | 2020-03-04 10:07:46 +0000 |
| commit | c00a5ee43188e29c6488f975c541659672ffa8e4 (patch) | |
| tree | 37fbb93889630c398e8e17615ea542c878e3dc9e | |
| parent | 4bf6577e7bbc88d2786c5e74a35f93fcd37aba7d (diff) | |
| parent | cab2453f16bc1b23138b5ec3873b8ccbafdafa94 (diff) | |
| download | tracker-c00a5ee43188e29c6488f975c541659672ffa8e4.tar.gz | |
Merge branch 'tracker-2.3' into 'tracker-2.3'
tracker-store: check whether private is NULL before visit its child
See merge request GNOME/tracker!192
| -rw-r--r-- | src/tracker-store/tracker-main.vala | 6 | ||||
| -rw-r--r-- | src/tracker-store/tracker-writeback.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/tracker-store/tracker-main.vala b/src/tracker-store/tracker-main.vala index 1e8d1ddd2..0db9b6653 100644 --- a/src/tracker-store/tracker-main.vala +++ b/src/tracker-store/tracker-main.vala @@ -368,12 +368,12 @@ License which can be viewed at: message ("Cleaning up"); + data_manager = null; + connection = null; + /* Shutdown major subsystems */ Tracker.Writeback.shutdown (); Tracker.Events.shutdown (); - - data_manager = null; - connection = null; Tracker.DBus.shutdown (); Tracker.Log.shutdown (); diff --git a/src/tracker-store/tracker-writeback.c b/src/tracker-store/tracker-writeback.c index 32517d553..fde45afc0 100644 --- a/src/tracker-store/tracker-writeback.c +++ b/src/tracker-store/tracker-writeback.c @@ -200,6 +200,8 @@ tracker_writeback_transact (void) GHashTableIter iter; gpointer key, value; + g_return_if_fail (private == NULL); + if (!private->pending_events) return; |