Skip to content

Commit 88b8746

Browse files
committed
Fix reversed title/message display
1 parent ce4eff3 commit 88b8746

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/Comms/LinkManager.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ bool LinkManager::createConnectedLink(SharedLinkConfigurationPtr &config)
171171
_rgLinks.append(link);
172172
config->setLink(link);
173173

174-
(void) connect(link.get(), &LinkInterface::communicationError, qgcApp(), &QGCApplication::showAppMessage);
174+
(void) connect(link.get(), &LinkInterface::communicationError, this, &LinkManager::_communicationError);
175175
(void) connect(link.get(), &LinkInterface::bytesReceived, MAVLinkProtocol::instance(), &MAVLinkProtocol::receiveBytes);
176176
(void) connect(link.get(), &LinkInterface::bytesSent, MAVLinkProtocol::instance(), &MAVLinkProtocol::logSentBytes);
177177
(void) connect(link.get(), &LinkInterface::disconnected, this, &LinkManager::_linkDisconnected);
@@ -189,6 +189,11 @@ bool LinkManager::createConnectedLink(SharedLinkConfigurationPtr &config)
189189
return true;
190190
}
191191

192+
void LinkManager::_communicationError(const QString &title, const QString &error)
193+
{
194+
qgcApp()->showAppMessage(error, title);
195+
}
196+
192197
SharedLinkInterfacePtr LinkManager::mavlinkForwardingLink()
193198
{
194199
for (SharedLinkInterfacePtr &link : _rgLinks) {

src/Comms/LinkManager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ class LinkManager : public QObject
124124

125125
private slots:
126126
void _linkDisconnected();
127+
void _communicationError(const QString &title, const QString &error);
127128

128129
private:
129130
QmlObjectListModel *_qmlLinkConfigurations();

0 commit comments

Comments
 (0)