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

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.
This commit is contained in:
Max Kellermann 2014-12-14 22:48:46 +01:00
parent d653f35bb7
commit 02563a35f0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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

2
src/lib/nfs/Connection.cxx
View File

@ -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 */