From 0eda5769e56b3f738ea6f6baa44782db382ae1f7 Mon Sep 17 00:00:00 2001 From: paulc Date: Sun, 30 Nov 2008 16:38:06 +0000 Subject: [PATCH] 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 --- modules/qt4/updater.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/qt4/updater.cpp b/modules/qt4/updater.cpp index 87176b6c..a959bfdd 100644 --- a/modules/qt4/updater.cpp +++ b/modules/qt4/updater.cpp @@ -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());