pull in candidate fix for https://bugs.kde.org/show_bug.cgi?id=358260
parent
08be4a3a9a
commit
b2075d5857
@ -0,0 +1,28 @@
|
|||||||
|
diff --git a/src/api/KWallet/kwallet.cpp b/src/api/KWallet/kwallet.cpp
|
||||||
|
index dffebda..15be0eb 100644
|
||||||
|
--- a/src/api/KWallet/kwallet.cpp
|
||||||
|
+++ b/src/api/KWallet/kwallet.cpp
|
||||||
|
@@ -363,14 +363,16 @@ bool Wallet::isOpen(const QString &name)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
#endif
|
||||||
|
- QDBusReply<bool> r = walletLauncher()->getInterface().isOpen(name);
|
||||||
|
+ if (walletLauncher()->m_walletEnabled) {
|
||||||
|
+ QDBusReply<bool> r = walletLauncher()->getInterface().isOpen(name);
|
||||||
|
|
||||||
|
- if (!r.isValid()) {
|
||||||
|
- qDebug() << "Invalid DBus reply: " << r.error();
|
||||||
|
- return false;
|
||||||
|
- } else {
|
||||||
|
- return r;
|
||||||
|
- }
|
||||||
|
+ if (!r.isValid()) {
|
||||||
|
+ qDebug() << "Invalid DBus reply: " << r.error();
|
||||||
|
+ return false;
|
||||||
|
+ } else {
|
||||||
|
+ return r;
|
||||||
|
+ }
|
||||||
|
+ } else return false;
|
||||||
|
#if HAVE_KSECRETSSERVICE
|
||||||
|
}
|
||||||
|
#endif
|
Loading…
Reference in new issue