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.

lib/nfs/Connection: fix reconnect after mount failure
02563a35 · Max Kellermann · d653f35b · 02563a35 · 02563a35
Commit 02563a35 authored Dec 14, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

NEWS NEWS +1 -0

Connection.cxx src/lib/nfs/Connection.cxx +1 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -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

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