From ee834720429a09b6727b310c46a464064c159a82 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 24 Jun 2012 15:08:43 +0200 Subject: [PATCH] Accumulate the app access flags instead of replacing them. Before, each permanently granted access flag would overwrite the previously granted flag, causing the dialog to come up whenever the operation was changed. --- src/servers/keystore/KeyStoreServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servers/keystore/KeyStoreServer.cpp b/src/servers/keystore/KeyStoreServer.cpp index 1892cc8511..2717012279 100644 --- a/src/servers/keystore/KeyStoreServer.cpp +++ b/src/servers/keystore/KeyStoreServer.cpp @@ -643,7 +643,7 @@ KeyStoreServer::_ValidateAppAccess(Keyring& keyring, const app_info& appInfo, appMessage.MakeEmpty(); appMessage.AddString("path", path.Path()); - appMessage.AddUInt32("flags", accessFlags); + appMessage.AddUInt32("flags", appFlags | accessFlags); appMessage.AddString("checksum", checksum); keyring.RemoveApplication(appInfo.signature, path.Path());