tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check PendingReady return values

Browse source 
Apparently you can get a valid accountset without a valid filter, which
then crashes

BUG: 352532
This commit is contained in:
David Edmundson 2015-09-10 21:51:08 +02:00
parent e4cbf22519
commit 2c0a138257
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
View file

@ -44,7 +44,11 @@ ConnectProtocolPtr KDEConnectTelepathyProtocolFactory::interface() {
//maybe this should be per device.. with a device ID as a parameter, but lets keep it connect for now //maybe this should be per device.. with a device ID as a parameter, but lets keep it connect for now
Tp::AccountManagerPtr am = Tp::AccountManager::create(QDBusConnection::sessionBus()); Tp::AccountManagerPtr am = Tp::AccountManager::create(QDBusConnection::sessionBus());
QObject::connect(am->becomeReady(), &Tp::PendingOperation::finished, [am]() { Tp::PendingReady *pr = am->becomeReady();
QObject::connect(pr, &Tp::PendingOperation::finished, [pr,am]() {
if (pr->isError()) {
return;
}
Tp::AccountSetPtr accounts = am->accountsByProtocol("kdeconnect"); Tp::AccountSetPtr accounts = am->accountsByProtocol("kdeconnect");
if (!accounts) { if (!accounts) {
return; return;
@ -52,7 +56,7 @@ ConnectProtocolPtr KDEConnectTelepathyProtocolFactory::interface() {
if (accounts->accounts().isEmpty()) { if (accounts->accounts().isEmpty()) {
Tp::PendingAccount* pa = am->createAccount("kdeconnect", "kdeconnect", "kdeconnect", QVariantMap(), QVariantMap()); Tp::PendingAccount* pa = am->createAccount("kdeconnect", "kdeconnect", "kdeconnect", QVariantMap(), QVariantMap());
QObject::connect(pa, &Tp::PendingOperation::finished, pa, [pa](){ QObject::connect(pa, &Tp::PendingOperation::finished, pa, [pa](){
if (!pa->account()) { if (pa->isError() || !pa->account()) {
return; return;
} }
pa->account()->setEnabled(true); pa->account()->setEnabled(true);