Reset: allow re-init of Nasal Ghosts.

[simgear.git] / simgear / io / HTTPClient.cxx

diff --git a/simgear/io/HTTPClient.cxx b/simgear/io/HTTPClient.cxx
index 03f13428d965f9265cfe6ea7bd35129b51994d87..b7e19917bc315caefa7e43acbc293a0c7101f627 100644 (file)
--- a/simgear/io/HTTPClient.cxx
+++ b/simgear/io/HTTPClient.cxx
@@ -645,9 +645,13 @@ void Client::setMaxConnections(unsigned int maxCon)
 
 void Client::update(int waitTimeout)
 {
-    d->poller.poll(waitTimeout);
-    bool waitingRequests = !d->pendingRequests.empty();
+    if (!d->poller.hasChannels() && (waitTimeout > 0)) {
+        SGTimeStamp::sleepForMSec(waitTimeout);
+    } else {
+        d->poller.poll(waitTimeout);
+    }
     
+    bool waitingRequests = !d->pendingRequests.empty();
     ConnectionDict::iterator it = d->connections.begin();
     for (; it != d->connections.end(); ) {
         Connection* con = it->second;
@@ -766,8 +770,8 @@ void Client::makeRequest(const Request_ptr& r)
 }
 
 //------------------------------------------------------------------------------
-FileRequestRef Client::urlretrieve( const std::string& url,
-                                 const std::string& filename )
+FileRequestRef Client::save( const std::string& url,
+                             const std::string& filename )
 {
   FileRequestRef req = new FileRequest(url, filename);
   makeRequest(req);
@@ -775,7 +779,7 @@ FileRequestRef Client::urlretrieve( const std::string& url,
 }
 
 //------------------------------------------------------------------------------
-MemoryRequestRef Client::urlload(const std::string& url)
+MemoryRequestRef Client::load(const std::string& url)
 {
   MemoryRequestRef req = new MemoryRequest(url);
   makeRequest(req);