2 files changed, 4 insertions, 2 deletions
diff --git a/src/Core/ConnectionManager.cpp b/src/Core/ConnectionManager.cpp
index ba78a98..b338f62 100644
--- a/src/Core/ConnectionManager.cpp
+++ b/src/Core/ConnectionManager.cpp
@@ -90,6 +90,8 @@ ConnectionManager::ConnectionManager() {
   catch(Net::Exception &e) {
     // TODO: Log error
   }
+  
+  refreshPollfds();
 }
 
 ConnectionManager::~ConnectionManager() {
diff --git a/src/Core/ConnectionManager.h b/src/Core/ConnectionManager.h
index b252910..cbfc812 100644
--- a/src/Core/ConnectionManager.h
+++ b/src/Core/ConnectionManager.h
@@ -59,8 +59,8 @@ class ConnectionManager {
     ConnectionManager();
     virtual ~ConnectionManager();
     
-    void wait(int timeout) {
-      poll(pollfds.data(), pollfds.size(), timeout);
+    bool wait(int timeout) {
+      return (poll(pollfds.data(), pollfds.size(), timeout) > 0);
     }
     
     void run();