aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/plugins
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-06-21 16:01:44 +0200
committerMax Kellermann <max@duempel.org>2015-06-21 16:06:02 +0200
commit90e7ace980fcfe4f894cd8e882fbfd2efba0b57d (patch)
treeb4810dd7c6fb09329e0e2c986aa2e0c6cae579fd /src/input/plugins
parent2b0a127fa565c3e78d3a1e11f0fc68547dc5a161 (diff)
parentb0ff3bc7a30674fe44e946e228e8c2facd8e8377 (diff)
downloadmpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.gz
mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.xz
mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.zip
Merge tag 'v0.19.10'
Diffstat (limited to '')
-rw-r--r--src/input/plugins/CurlInputPlugin.cxx2
-rw-r--r--src/input/plugins/SmbclientInputPlugin.cxx1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index fb5845b2b..ade8324ec 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -453,6 +453,8 @@ CurlInputStream::RequestDone(CURLcode result, long status)
SeekDone();
else if (!IsReady())
SetReady();
+ else
+ cond.broadcast();
}
static void
diff --git a/src/input/plugins/SmbclientInputPlugin.cxx b/src/input/plugins/SmbclientInputPlugin.cxx
index 6aab556f2..ec6857c19 100644
--- a/src/input/plugins/SmbclientInputPlugin.cxx
+++ b/src/input/plugins/SmbclientInputPlugin.cxx
@@ -132,6 +132,7 @@ SmbclientInputStream::Read(void *ptr, size_t read_size, Error &error)
nbytes = 0;
}
+ offset += nbytes;
return nbytes;
}