diff options
author | Martin Zielinski <martin.zielinski@nokia.com> | 2012-04-12 15:00:50 +0200 |
---|---|---|
committer | Chris Craig <ext-chris.craig@nokia.com> | 2012-04-12 21:21:00 +0200 |
commit | 874b3b8e96efe2b352b8218ec700e1ac2dd3094d (patch) | |
tree | 627a32bcf332b65a6e427687a9272497dd9171a7 | |
parent | 857e697d53196eca073ad7f9e7a3eeb3ddc70362 (diff) |
Do not destroy prelaunch runtimes on disable
We need to be able to disable prelaunched runtimes without
destroying the created ones. Destruction of exisiting runtimes
happen when memory is restricted.
Change-Id: Ia366b872951ff0c783e741ab5f081d5970d45a7d
Reviewed-by: Chris Craig <ext-chris.craig@nokia.com>
-rw-r--r-- | src/core/prelaunchprocessbackendfactory.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/prelaunchprocessbackendfactory.cpp b/src/core/prelaunchprocessbackendfactory.cpp index 0e63c22..06356e3 100644 --- a/src/core/prelaunchprocessbackendfactory.cpp +++ b/src/core/prelaunchprocessbackendfactory.cpp @@ -150,12 +150,6 @@ void PrelaunchProcessBackendFactory::setPrelaunchEnabled(bool value) { if (m_prelaunchEnabled != value) { m_prelaunchEnabled = value; - if (!m_prelaunchEnabled) { - if (m_prelaunch) { - m_prelaunch->deleteLater(); - m_prelaunch = NULL; - } - } updateState(); emit prelaunchEnabledChanged(); } @@ -255,7 +249,6 @@ void PrelaunchProcessBackendFactory::prelaunchError(QProcess::ProcessError err) */ void PrelaunchProcessBackendFactory::updateState() { - Q_ASSERT(!m_prelaunch || m_prelaunchEnabled); // If prelaunch is not enabled, we must not have a prelaunch process Q_ASSERT(!m_prelaunch || !m_memoryRestricted); // If memory is restricted, we must not have a prelaunch process setIdleCpuRequest(!m_memoryRestricted && m_prelaunchEnabled && !m_prelaunch && m_info); |