diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2019-10-05 21:10:12 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2019-10-05 21:10:12 -0400 |
| commit | 78fb19eb26c8814cc83c649a252b7f47bdf649a0 (patch) | |
| tree | e8f38f35e404b37d4683604cb2a826ff3f4d2f1d /src/lib/barrier/ServerApp.cpp | |
| parent | 226b07c35afedc28ad1a769d6bf539e6cab320d4 (diff) | |
| parent | dff8b887edf10407f22aaab9d147948cd5491f0a (diff) | |
Update upstream source from tag 'upstream/2.3.2+dfsg'
Update to upstream version '2.3.2+dfsg'
with Debian dir da6cb58f0203c792df99a475344204697ce64812
Diffstat (limited to 'src/lib/barrier/ServerApp.cpp')
| -rw-r--r-- | src/lib/barrier/ServerApp.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/barrier/ServerApp.cpp b/src/lib/barrier/ServerApp.cpp index fbb5092..318673c 100644 --- a/src/lib/barrier/ServerApp.cpp +++ b/src/lib/barrier/ServerApp.cpp @@ -302,8 +302,8 @@ void ServerApp::stopRetryTimer() { if (m_timer != NULL) { + m_events->removeHandler(Event::kTimer, m_timer); m_events->deleteTimer(m_timer); - m_events->removeHandler(Event::kTimer, NULL); m_timer = NULL; } } @@ -713,8 +713,7 @@ ServerApp::mainLoop() { // create socket multiplexer. this must happen after daemonization // on unix because threads evaporate across a fork(). - SocketMultiplexer multiplexer; - setSocketMultiplexer(&multiplexer); + setSocketMultiplexer(std::make_unique<SocketMultiplexer>()); // if configuration has no screens then add this system // as the default |