oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

nfs: work around assertion failure on exception during program init

Browse Source 
Closes #477
This commit is contained in:
Max Kellermann 2019-02-15 18:33:58 +01:00
parent f70eb63879
commit 281461f0f0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/nfs/Manager.cxx
View File

@ -73,7 +73,7 @@ NfsManager::Compare::operator()(const ManagedConnection &a,
NfsManager::~NfsManager() noexcept NfsManager::~NfsManager() noexcept
{ {
assert(GetEventLoop().IsInside()); assert(!GetEventLoop().IsAlive() || GetEventLoop().IsInside());
CollectGarbage(); CollectGarbage();
@ -103,7 +103,7 @@ NfsManager::GetConnection(const char *server, const char *export_name) noexcept
void void
NfsManager::CollectGarbage() noexcept NfsManager::CollectGarbage() noexcept
{ {
assert(GetEventLoop().IsInside()); assert(!GetEventLoop().IsAlive() || GetEventLoop().IsInside());
garbage.clear_and_dispose(DeleteDisposer()); garbage.clear_and_dispose(DeleteDisposer());
} }

2
src/storage/plugins/NfsStorage.cxx
View File

@ -192,7 +192,7 @@ private:
} }
void Disconnect() noexcept { void Disconnect() noexcept {
assert(GetEventLoop().IsInside()); assert(!GetEventLoop().IsAlive() || GetEventLoop().IsInside());
switch (state) { switch (state) {
case State::INITIAL: case State::INITIAL: