[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:27:53 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e828504

The following commit has been merged in the master branch:
commit e82850411d92cc4df69d63998745d60b18d3bd9e
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Sep 1 17:49:09 2014 +0200

    Import error reporting
    
    I was getting a crash, it was because of a set up problem, but having this
    helped me to figure it out.
---
 core/device.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index 0e341d1..103cca9 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -86,8 +86,13 @@ void Device::initPrivateKey()
     //TODO: It is redundant to have our own private key in every instance of Device, move this to a singleton somewhere (Daemon?)
     const QString privateKeyPath = KStandardDirs::locateLocal("appdata", "key.pem", true);
     QFile privKey(privateKeyPath);
-    privKey.open(QIODevice::ReadOnly);
-    m_privateKey = QCA::PrivateKey::fromPEM(privKey.readAll());
+    if (privKey.open(QIODevice::ReadOnly))
+        m_privateKey = QCA::PrivateKey::fromPEM(privKey.readAll());
+    else {
+        qWarning() << "Could not open the private key" << privateKeyPath;
+    }
+
+    Q_ASSERT(!m_privateKey.isNull());
 }
 
 Device::~Device()

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list