feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix multiple connections on runner restarted

Browse Source 
Change-Id: I5ea243d9f5d2266500378381b78c0b2610261f14
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Filipe Azevedo
2017-10-20 14:55:19 +02:00
parent d91a004b24
commit dbd812e641
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
View File

@@ -177,6 +177,13 @@ PortsGatherer::PortsGatherer(RunControl *runControl)
: RunWorker(runControl) : RunWorker(runControl)
{ {
setDisplayName("PortGatherer"); setDisplayName("PortGatherer");
connect(&m_portsGatherer, &DeviceUsedPortsGatherer::error, this, &PortsGatherer::reportFailure);
connect(&m_portsGatherer, &DeviceUsedPortsGatherer::portListReady, this, [this] {
m_portList = device()->freePorts();
appendMessage(tr("Found %n free ports.", nullptr, m_portList.count()), NormalMessageFormat);
reportStarted();
});
} }
PortsGatherer::~PortsGatherer() PortsGatherer::~PortsGatherer()
@@ -185,15 +192,7 @@ PortsGatherer::~PortsGatherer()
void PortsGatherer::start() void PortsGatherer::start()
{ {
appendMessage(tr("Checking available ports...") + '\n', NormalMessageFormat); appendMessage(tr("Checking available ports..."), NormalMessageFormat);
connect(&m_portsGatherer, &DeviceUsedPortsGatherer::error, this, [this](const QString &msg) {
reportFailure(msg);
});
connect(&m_portsGatherer, &DeviceUsedPortsGatherer::portListReady, this, [this] {
m_portList = device()->freePorts();
appendMessage(tr("Found %n free ports.", nullptr, m_portList.count()) + '\n', NormalMessageFormat);
reportStarted();
});
m_portsGatherer.start(device()); m_portsGatherer.start(device());
} }