From 84cb598a0deb15683c81afe7da059564e73a0ed7 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Mon, 4 Sep 2017 22:34:16 +0200
Subject: [PATCH] SerialBusConnection: Improve connect/disconnect handling

* disconnectDevice() already checks mDev_p
* use the error description provided by QCanBus::createDevice()
---
 connections/serialbusconnection.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/connections/serialbusconnection.cpp b/connections/serialbusconnection.cpp
index b203439..50ebe87 100644
--- a/connections/serialbusconnection.cpp
+++ b/connections/serialbusconnection.cpp
@@ -67,8 +67,7 @@ void SerialBusConnection::piSetBusSettings(int pBusIdx, CANBus bus)
         return;
 
     /* disconnect device if we have one connected */
-    if(mDev_p)
-        disconnectDevice();
+    disconnectDevice();
 
     /* copy bus config */
     setBusConfig(0, bus);
@@ -78,10 +77,11 @@ void SerialBusConnection::piSetBusSettings(int pBusIdx, CANBus bus)
         return;
 
     /* create device */
-    mDev_p = QCanBus::instance()->createDevice("socketcan", getPort());
+    QString errorString;
+    mDev_p = QCanBus::instance()->createDevice("socketcan", getPort(), &errorString);
     if (!mDev_p) {
         disconnectDevice();
-        qDebug() << "can't create device";
+        qDebug() << "Error: createDevice(" << getType() << getPort() << "):" << errorString;
         return;
     }