From ffa1f9f870024be8fcc26f35a80924a3711dd615 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 8 May 2019 09:42:16 +0200 Subject: App output filter: Try harder to detect an invalid text block Calling QTextBlock::isValid() is not enough to ensure that the block is still part of the document. Fixes: QTCREATORBUG-22379 Change-Id: I3016e763b67f3983bdb9077c80ae3de8d46e4080 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/outputwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/coreplugin') diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index 7a85a251f0..077b6f406d 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -331,8 +331,10 @@ void OutputWindow::filterNewContent() auto &lastBlock = d->lastFilteredBlock; - if (!lastBlock.isValid()) + if (!lastBlock.isValid() || lastBlock.blockNumber() >= document->blockCount() + || document->findBlockByNumber(lastBlock.blockNumber()) != lastBlock) { lastBlock = document->begin(); + } if (d->filterMode.testFlag(OutputWindow::FilterModeFlag::RegExp)) { QRegularExpression regExp(d->filterText); -- cgit v1.2.1