aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-05 10:03:28 +0100
committerMax Kellermann <max@duempel.org>2014-02-05 10:04:03 +0100
commit2c70251df19f2a92214a380ffbdfdb40a649d9bc (patch)
tree54cd29fc9fd431fa8f9e3966f3c848b2fb40d9e4
parentd380db25be3a37666d1c908343115ed5490db968 (diff)
downloadmpd-2c70251df19f2a92214a380ffbdfdb40a649d9bc.tar.gz
mpd-2c70251df19f2a92214a380ffbdfdb40a649d9bc.tar.xz
mpd-2c70251df19f2a92214a380ffbdfdb40a649d9bc.zip
db/UpdateGlue: relax assertion
Fixes assertion failure when update gets launched during MPD startup.
-rw-r--r--src/db/update/UpdateGlue.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/db/update/UpdateGlue.cxx b/src/db/update/UpdateGlue.cxx
index 32e817ff1..41640e0ef 100644
--- a/src/db/update/UpdateGlue.cxx
+++ b/src/db/update/UpdateGlue.cxx
@@ -77,7 +77,7 @@ UpdateService::Task(void *ctx)
void
UpdateService::StartThread(UpdateQueueItem &&i)
{
- assert(GetEventLoop().IsInside());
+ assert(GetEventLoop().IsInsideOrNull());
progress = UPDATE_PROGRESS_RUNNING;
modified = false;
@@ -104,7 +104,7 @@ UpdateService::GenerateId()
unsigned
UpdateService::Enqueue(const char *path, bool discard)
{
- assert(GetEventLoop().IsInside());
+ assert(GetEventLoop().IsInsideOrNull());
if (progress != UPDATE_PROGRESS_IDLE) {
const unsigned id = GenerateId();