retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Get default updater policy from client config file. 

Exit using Engine method, don't trust Qt client.

git-svn-id: http://voip.null.ro/svn/yate@2380 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2008-11-30 16:38:06 +00:00
parent 5974829da7
commit 0eda5769e5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/qt4/updater.cpp
View File

@ -126,7 +126,9 @@ bool UpdateLogic::initializedClient()
m_install = Client::s_settings.getBoolValue(toString(),"install") &&
QFile::exists(filePath(false));
Client::self()->setActive("upd_install",m_install);
setPolicy(Client::s_settings.getIntValue(toString(),"policy",s_policies,Never),false);
int policy = Engine::config().getIntValue("client",toString(),s_policies,Never);
policy = Client::s_settings.getIntValue(toString(),"policy",s_policies,policy);
setPolicy(policy,false);
if (m_install && (m_policy >= Install))
startInstalling();
else if (m_policy >= Check)
@ -267,10 +269,7 @@ void UpdateLogic::startInstalling()
cmd = filePath(false);
if (QProcess::startDetached(cmd)) {
Debug(toString(),DebugNote,"Executing: %s",cmd.toUtf8().constData());
if (Client::self())
Client::self()->quit();
else
Engine::halt(0);
Engine::halt(0);
return;
}
Debug(toString(),DebugWarn,"Failed to execute: %s",cmd.toUtf8().constData());