From bd3a356ce9dabb2c4190a869e7bf0980f0e61170 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 19 May 2020 10:02:09 +0200 Subject: [PATCH] ProjectExplorer: Fix soft assert in CustomParserSettings Amends c15e09e0fe. Change-Id: I73995f14cdb310cdffa9581efb388fe37c39229c Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/customparser.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index 2cc75b308bf..03eee63c30b 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -86,9 +86,8 @@ CustomParserExpression::CustomParserChannel CustomParserExpression::channel() co void CustomParserExpression::setChannel(CustomParserExpression::CustomParserChannel channel) { - QTC_ASSERT(channel > ParseNoChannel && channel <= ParseBothChannels, - channel = ParseBothChannels); - + if (channel == ParseNoChannel || channel > ParseBothChannels) + channel = ParseBothChannels; m_channel = channel; } @@ -131,10 +130,7 @@ void CustomParserExpression::fromMap(const QVariantMap &map) setFileNameCap(map.value(fileNameCapKey).toInt()); setLineNumberCap(map.value(lineNumberCapKey).toInt()); setExample(map.value(exampleKey).toString()); - int channel = map.value(channelKey).toInt(); - if (channel == ParseNoChannel || channel > ParseBothChannels) - channel = ParseStdErrChannel; - setChannel(static_cast(channel)); + setChannel(static_cast(map.value(channelKey).toInt())); } int CustomParserExpression::lineNumberCap() const