diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-14 22:48:46 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-14 22:49:16 +0100 |
| commit | 02563a35f0ce4bb5154a68bd568d0263c76ec261 (patch) | |
| tree | 51eadcf645c6625cfffb355729f420e675291ae2 | |
| parent | d653f35bb7488b2da3412fc23e16b4da1770f8d4 (diff) | |
| download | mpd-02563a35f0ce4bb5154a68bd568d0263c76ec261.tar.gz mpd-02563a35f0ce4bb5154a68bd568d0263c76ec261.tar.xz mpd-02563a35f0ce4bb5154a68bd568d0263c76ec261.zip | |
lib/nfs/Connection: fix reconnect after mount failure
When mounting had not yet finished, SocketMonitor::IsDefined() was
always false, due to the workaround at the beginning of the function
that calls SocketMonitor::Steal(). This commit drops the IsDefined()
check because it was never necessary and breaks reconnect.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/lib/nfs/Connection.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -2,6 +2,7 @@ ver 0.19.7 (not yet released) * input - nfs: fix crash while canceling a failing file open operation - nfs: fix memory leak on connection failure + - nfs: fix reconnect after mount failure * playlist - don't skip non-existent songs in "listplaylist" * fix memory allocator bug on Windows diff --git a/src/lib/nfs/Connection.cxx b/src/lib/nfs/Connection.cxx index e0d8ad774..04c5a9e53 100644 --- a/src/lib/nfs/Connection.cxx +++ b/src/lib/nfs/Connection.cxx @@ -483,7 +483,7 @@ NfsConnection::OnSocketReady(unsigned flags) DestroyContext(); closed = true; - } else if (SocketMonitor::IsDefined() && nfs_get_fd(context) < 0) { + } else if (nfs_get_fd(context) < 0) { /* this happens when rpc_reconnect_requeue() is called after the connection broke, but autoreconnect was disabled - nfs_service() returns 0 */ |