summaryrefslogtreecommitdiff
path: root/src/assistant/assistant/mainwindow.cpp
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2018-04-06 16:44:09 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2018-04-09 13:30:24 +0000
commite96c1bf0da93d3448d09d2364a910e4d784d5723 (patch)
treeea4b6f3e2c8c0a9efc607f2a92d64ea263cf124e /src/assistant/assistant/mainwindow.cpp
parentc96755ea7eede1f1881e00718fc03c3f5f693c33 (diff)
downloadqttools-e96c1bf0da93d3448d09d2364a910e4d784d5723.tar.gz
Fix possible crash inside connection to the lambda
Pass "this" context object to the connect(). Otherwise when "this" instance gets deleted and the sender still exists, the lambda expression is still invoked for the deleted object. Change-Id: I0a38489fac302a85abc80928c6244383ff1870ff Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/assistant/assistant/mainwindow.cpp')
-rw-r--r--src/assistant/assistant/mainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 2ceb86d3b..d81cc45fd 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -163,7 +163,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
connect(bookMarkManager, &BookmarkManager::setSource,
m_centralWidget, &CentralWidget::setSource);
connect(bookMarkManager, &BookmarkManager::setSourceInNewTab,
- [openPagesManager](const QUrl &url){ openPagesManager->createPage(url); });
+ openPagesManager, [openPagesManager](const QUrl &url){ openPagesManager->createPage(url); });
QHelpSearchEngine *searchEngine = helpEngineWrapper.searchEngine();
connect(searchEngine, &QHelpSearchEngine::indexingStarted,
@@ -681,7 +681,7 @@ void MainWindow::setupActions()
connect(m_centralWidget, &CentralWidget::backwardAvailable,
globalActions, &GlobalActions::updateActions);
connect(m_centralWidget, &CentralWidget::highlighted,
- [this](const QString &link) { statusBar()->showMessage(link);} );
+ this, [this](const QString &link) { statusBar()->showMessage(link);} );
// index window
connect(m_indexWindow, &IndexWindow::linkActivated,