diff options
| author | David Robillard <d@drobilla.net> | 2013-02-02 05:08:16 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-02-02 05:08:16 +0000 |
| commit | 310642666f666c80417c1bf01514102d9f0a0674 (patch) | |
| tree | 952fc561cd66e04804f6000e39ad357d0a94e0ff /src/socket | |
| parent | e3d2efb034677c315eb83e4b19651f1737e07ee0 (diff) | |
| download | ingen-310642666f666c80417c1bf01514102d9f0a0674.tar.gz ingen-310642666f666c80417c1bf01514102d9f0a0674.tar.bz2 ingen-310642666f666c80417c1bf01514102d9f0a0674.zip | |
Fix potential deadlock on exit. Maybe.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5020 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/socket')
| -rw-r--r-- | src/socket/SocketListener.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/socket/SocketListener.cpp b/src/socket/SocketListener.cpp index 4e1f9512..55c2de37 100644 --- a/src/socket/SocketListener.cpp +++ b/src/socket/SocketListener.cpp @@ -69,9 +69,9 @@ SocketListener::~SocketListener() _exit_flag = true; _unix_sock.shutdown(); _net_sock.shutdown(); - join(); _unix_sock.close(); _net_sock.close(); + join(); unlink(_unix_path.c_str()); } @@ -97,7 +97,7 @@ SocketListener::_run() while (true) { // Wait for input to arrive at a socket - int ret = poll(pfds, nfds, -1); + const int ret = poll(pfds, nfds, -1); if (_exit_flag) { break; } else if (ret == -1) { |