From 3e0cd20746a1446df8a922bbe8badcd922881903 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 28 Oct 2014 07:36:28 +0100
Subject: [PATCH] Use a local variable for the port list, use correct null ptr
 macro

---
 src/comm/SerialLink.cc | 13 +++++++------
 src/comm/SerialLink.h  |  1 -
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc
index 4a879fb32..d499e4837 100644
--- a/src/comm/SerialLink.cc
+++ b/src/comm/SerialLink.cc
@@ -22,7 +22,7 @@
 SerialLink::SerialLink(QString portname, int baudRate, bool hardwareFlowControl, bool parity,
                        int dataBits, int stopBits) :
     m_bytesRead(0),
-    m_port(NULL),
+    m_port(Q_NULLPTR),
     type(""),
     m_is_cdc(true),
     m_stopp(false),
@@ -34,9 +34,10 @@ SerialLink::SerialLink(QString portname, int baudRate, bool hardwareFlowControl,
 
     // Get the name of the current port in use.
     m_portName = portname.trimmed();
-    if (m_portName == "" && getCurrentPorts().size() > 0)
+    QList<QString> ports = getCurrentPorts();
+    if (m_portName == "" && ports.size() > 0)
     {
-        m_portName = m_ports.first().trimmed();
+        m_portName = ports.first().trimmed();
     }
 
     checkIfCDC();
@@ -96,15 +97,15 @@ SerialLink::~SerialLink()
 
 QList<QString> SerialLink::getCurrentPorts()
 {
-    m_ports.clear();
+    QList<QString> ports;
 
     QList<QSerialPortInfo> portList =  QSerialPortInfo::availablePorts();
     foreach (const QSerialPortInfo &info, portList)
     {
-        m_ports.append(info.portName());
+        ports.append(info.portName());
     }
 
-    return m_ports;
+    return ports;
 }
 
 bool SerialLink::isBootloader()
diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h
index 90d155f17..75632632a 100644
--- a/src/comm/SerialLink.h
+++ b/src/comm/SerialLink.h
@@ -158,7 +158,6 @@ protected:
     int m_id;
     QMutex m_dataMutex;       // Mutex for reading data from m_port
     QMutex m_writeMutex;      // Mutex for accessing the m_transmitBuffer.
-    QList<QString> m_ports;
     QString type;
     bool m_is_cdc;
 
-- 
2.22.0