aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authort4.ravenbird <t4.ravenbird@gmail.com>2014-02-19 15:59:32 +0100
committert4.ravenbird <t4.ravenbird@gmail.com>2014-02-20 08:29:44 +0100
commit6ab504da6cb4487fee1bc343ba9c13af0ff7b780 (patch)
treedecd01e5bef22a398c556684535bf91eba63ecb6
parentf6f539a7c933b37f3efd08cea765f1f0f59a30c5 (diff)
timeout while fixed-wait is expected and no error
-rw-r--r--xbmc/network/WakeOnAccess.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/xbmc/network/WakeOnAccess.cpp b/xbmc/network/WakeOnAccess.cpp
index 446c7e3e54..0b7a3ccd14 100644
--- a/xbmc/network/WakeOnAccess.cpp
+++ b/xbmc/network/WakeOnAccess.cpp
@@ -356,6 +356,9 @@ bool CWakeOnAccess::WakeUpHost (const CStdString& hostName, const string& custom
bool ret = WakeUpHost(server);
+ if (!ret) // extra log if we fail for some reason
+ CLog::Log(LOGWARNING,"WakeOnAccess failed to bring up [%s] - there may be trouble ahead !", hostName.c_str());
+
TouchHostEntry(hostName);
return ret;
@@ -416,11 +419,12 @@ bool CWakeOnAccess::WakeUpHost(const WakeUpEntry& server)
}
}
+ // we have ping response ; just add extra wait-for-services before returning if requested
+
{
WaitCondition waitObj ; // wait uninteruptable fixed time for services ..
- if (ProgressDialogHelper::Success != dlg.ShowAndWait (waitObj, server.wait_services_sec, LOCALIZED(13032)))
- return false;
+ dlg.ShowAndWait (waitObj, server.wait_services_sec, LOCALIZED(13032));
CLog::Log(LOGNOTICE,"WakeOnAccess sequence completed, server started");
}