Rex Dieter 8 years ago
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

@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.25.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for password management
License: LGPLv2+
@ -19,6 +19,10 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra
## upstream patches
## upstreamable patches
# https://git.reviewboard.kde.org/r/128831
Patch100: fix-isOpen-crash-when-wallet-disabled.patch
BuildRequires: extra-cmake-modules >= %{version}
BuildRequires: kf5-kconfig-devel >= %{version}
BuildRequires: kf5-kcoreaddons-devel >= %{version}
@ -108,6 +112,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
* Tue Sep 06 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.25.0-2
- pull in candidate fix for https://bugs.kde.org/show_bug.cgi?id=358260
* Mon Aug 08 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.25.0-1
- KDE Frameworks 5.25.0

Loading…
Cancel
Save