diff options
author | Robert Griebl <robert.griebl@qt.io> | 2020-01-21 16:01:44 +0100 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2020-01-21 16:13:18 +0100 |
commit | 6393474dc5f8de581c5d2c07946d22990ff0f004 (patch) | |
tree | 624cd1e393b2ef5e3f6507523aeb00a10d98bcfd /src/manager-lib/package.cpp | |
parent | ea1421e218e330e27e1f059e55a6d6babb1f7c69 (diff) | |
parent | 0c69e083ac5f5e97c9da09bdf1bd979dbe87ea93 (diff) | |
download | qtapplicationmanager-6393474dc5f8de581c5d2c07946d22990ff0f004.tar.gz |
Merge remote-tracking branch 'gerrit/5.13' into 5.14
Change-Id: I3e8a149be99266ad6438759fda9acb1c9dd12448
Diffstat (limited to 'src/manager-lib/package.cpp')
-rw-r--r-- | src/manager-lib/package.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/manager-lib/package.cpp b/src/manager-lib/package.cpp index 7ad4b1cf..e180fc7b 100644 --- a/src/manager-lib/package.cpp +++ b/src/manager-lib/package.cpp @@ -208,6 +208,7 @@ bool Package::block() bool blockedNow = (m_blocked.fetchAndAddOrdered(1) == 0); if (blockedNow) { m_blockedApps = info()->applications(); + m_blockedAppsCount = m_blockedApps.count(); emit blockedChanged(true); } return blockedNow; @@ -218,6 +219,7 @@ bool Package::unblock() bool unblockedNow = (m_blocked.fetchAndSubOrdered(1) == 1); if (unblockedNow) { m_blockedApps.clear(); + m_blockedAppsCount = 0; emit blockedChanged(false); } return unblockedNow; @@ -234,11 +236,12 @@ void Package::applicationStoppedDueToBlock(const QString &appId) }); if (it != m_blockedApps.cend()) m_blockedApps.removeOne(*it); + m_blockedAppsCount = m_blockedApps.count(); } bool Package::areAllApplicationsStoppedDueToBlock() const { - return isBlocked() && m_blockedApps.isEmpty(); + return isBlocked() && !m_blockedAppsCount; } QT_END_NAMESPACE_AM |