aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/rewind_input_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-15 21:48:33 +0200
committerMax Kellermann <max@duempel.org>2011-09-15 21:48:33 +0200
commitf804a739b1c4dd96efe268a84d58bfe4750b3378 (patch)
tree6abfb38026191f3b0c720a1ffea069769df1ec53 /src/input/rewind_input_plugin.c
parent8751783a1b4fe8c61ac63b718be1df5f1d77d339 (diff)
parent2ed870c8546ce4654f956beea60546260d98a85c (diff)
downloadmpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.tar.gz
mpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.tar.xz
mpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac
Diffstat (limited to '')
-rw-r--r--src/input/rewind_input_plugin.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/input/rewind_input_plugin.c b/src/input/rewind_input_plugin.c
index 9d3255cfe..fa2065d61 100644
--- a/src/input/rewind_input_plugin.c
+++ b/src/input/rewind_input_plugin.c
@@ -83,12 +83,14 @@ copy_attributes(struct input_rewind *r)
assert(dest != src);
assert(src->mime == NULL || dest->mime != src->mime);
+ bool dest_ready = dest->ready;
+
dest->ready = src->ready;
dest->seekable = src->seekable;
dest->size = src->size;
dest->offset = src->offset;
- if (src->mime != NULL) {
+ if (!dest_ready && src->ready) {
g_free(dest->mime);
dest->mime = g_strdup(src->mime);
}