Merge pull request #3456 from brauner/2020-06-23/lxc_stop_fixes

src/lxc/lxccontainer.c

@@ -2090,6 +2090,7 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
 
 		if (ret < MAX_STATE)
 			return false;
+	}
 
 	if (pidfd >= 0) {
 		struct pollfd pidfd_poll = {
@@ -2125,7 +2126,6 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
 
 		TRACE("Sent signal %d to pid %d", haltsignal, pid);
 	}
-	}
 
 	if (timeout == 0)
 		return true;