summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@coaxion.net>2020-10-14 11:45:48 +0000
committerSebastian Dröge <slomo@coaxion.net>2020-10-14 11:45:48 +0000
commit58d5b27ec52f4c7b344ff294b4c0aa30736cb185 (patch)
treec289985bcf7b2eb01495f3f587c4a26198e63bb3
parent730a395701d2c948c0fab0c0e3a092fd4a6016a0 (diff)
parent2996d0d68987d4f829c87c1e86d42d303b753e1e (diff)
downloadglib-58d5b27ec52f4c7b344ff294b4c0aa30736cb185.tar.gz
Merge branch 'file-replace-contents-refcounting' into 'master'
gfile: Clarify refcount handling for g_file_replace_contents_bytes_async() See merge request GNOME/glib!1695
-rw-r--r--gio/gfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gio/gfile.c b/gio/gfile.c
index 6e3b524f7..f92c07612 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -7580,7 +7580,6 @@ replace_contents_close_callback (GObject *obj,
/* Ignore errors here, we're only reading anyway */
g_output_stream_close_finish (stream, close_res, NULL);
- g_object_unref (stream);
if (!data->failed)
{
@@ -7662,6 +7661,7 @@ replace_contents_open_callback (GObject *obj,
g_task_get_cancellable (data->task),
replace_contents_write_callback,
data);
+ g_object_unref (stream); /* ownership is transferred to the write_async() call above */
}
else
{