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

Fix assert

Browse source
This commit is contained in:
Aleix Pol 2015-12-17 17:58:33 +01:00
parent 7ed012e4a5
commit 8a019ccddf
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -14,8 +14,8 @@ find_package(Qt5 5.2 REQUIRED COMPONENTS Quick)
find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons) find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons)
find_package(KF5DocTools) find_package(KF5DocTools)
find_package(Qca-qt5 2.1.0 REQUIRED) find_package(Qca-qt5 2.1.0 REQUIRED)
find_package(TelepathyQt5 0.9.5) # find_package(TelepathyQt5 0.9.5)
find_package(TelepathyQt5Service 0.9.7) # find_package(TelepathyQt5Service 0.9.7)
if (TelepathyQt5_FOUND AND TelepathyQt5Service_FOUND) if (TelepathyQt5_FOUND AND TelepathyQt5Service_FOUND)
add_definitions(-DHAVE_TELEPATHY) add_definitions(-DHAVE_TELEPATHY)
endif() endif()

3
core/backends/lan/landevicelink.cpp
View file

@ -134,12 +134,11 @@ void LanDeviceLink::userRequestsUnpair()
void LanDeviceLink::setPairStatus(PairStatus status) void LanDeviceLink::setPairStatus(PairStatus status)
{ {
DeviceLink::setPairStatus(status);
if (status == Paired) { if (status == Paired) {
Q_ASSERT(KdeConnectConfig::instance()->trustedDevices().contains(deviceId())); Q_ASSERT(KdeConnectConfig::instance()->trustedDevices().contains(deviceId()));
Q_ASSERT(!mSocketLineReader->peerCertificate().isNull()); Q_ASSERT(!mSocketLineReader->peerCertificate().isNull());
KdeConnectConfig::instance()->setDeviceProperty(deviceId(), "certificate", mSocketLineReader->peerCertificate().toPem()); KdeConnectConfig::instance()->setDeviceProperty(deviceId(), "certificate", mSocketLineReader->peerCertificate().toPem());
} }
DeviceLink::setPairStatus(status);
} }