[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kaccounts-providers] /: Handle KWallet correctly, do not crash on Deny
From: Alex Fiestas <afiestas () kde ! org>
Date: 2015-10-15 21:01:26
Message-ID: E1ZmpeQ-0000yK-Dj () scm ! kde ! org
[Download RAW message or body]
Git commit d99aab062407ffc316fe64bdded52bfa7516dfd5 by Alex Fiestas.
Committed on 22/05/2012 at 18:10.
Pushed by mklapetek into branch 'master'.
Handle KWallet correctly, do not crash on Deny
M +1 -1 jobs/ocreatecontact.cpp
M +1 -1 owncloud.cpp
http://commits.kde.org/kaccounts-providers/d99aab062407ffc316fe64bdded52bfa7516dfd5
diff --git a/jobs/ocreatecontact.cpp b/jobs/ocreatecontact.cpp
index 5717922..a3707cc 100644
--- a/jobs/ocreatecontact.cpp
+++ b/jobs/ocreatecontact.cpp
@@ -124,7 +124,7 @@ void OCreateContact::resourceCreated(KJob* job)
}
Wallet *wallet = Wallet::openWallet(Wallet::NetworkWallet(), windowId, Wallet::Synchronous);
- if (!wallet->isOpen() || !wallet->isEnabled()) {
+ if (!wallet || !wallet->isOpen() || !wallet->isEnabled()) {
setError(-1);
emitResult();
return;
diff --git a/owncloud.cpp b/owncloud.cpp
index 429e0c8..7c5aa84 100644
--- a/owncloud.cpp
+++ b/owncloud.cpp
@@ -69,7 +69,7 @@ void OwnCloudWizard::done(int result)
Wallet *wallet = Wallet::openWallet(Wallet::NetworkWallet(), windowId, Wallet::Synchronous);
- if (!wallet->isOpen() || !wallet->isEnabled()) {
+ if (!wallet || !wallet->isOpen() || !wallet->isEnabled()) {
return;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic