You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
kf5-kwallet/fix-isOpen-crash-when-walle...

29 lines
910 B

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