summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Tillmanns <marcus.tillmanns@qt.io>2023-05-15 16:24:13 +0200
committerMarcus Tillmanns <marcus.tillmanns@qt.io>2023-05-16 05:01:49 +0000
commita3e9fc37ba3fc01ad441ca574b1f9d66520d5ff6 (patch)
treefac4929e0164b7c183f958bcb33e8c78868b9ea2
parent9ff0cf7306eed74f36bd1826fe6ec5b26d5f25e9 (diff)
downloadqt-creator-a3e9fc37ba3fc01ad441ca574b1f9d66520d5ff6.tar.gz
Terminal: Fix assert
Trying to fetch a cell outside the valid range did trigger an assert. Change-Id: I5ac3d78aa2249d1559e7603c9e4a9bcea4d0b563 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
-rw-r--r--src/plugins/terminal/celliterator.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/terminal/celliterator.cpp b/src/plugins/terminal/celliterator.cpp
index 597c3a632f..d81c4b7187 100644
--- a/src/plugins/terminal/celliterator.cpp
+++ b/src/plugins/terminal/celliterator.cpp
@@ -20,12 +20,12 @@ CellIterator::CellIterator(const TerminalSurface *surface, int pos)
m_maxpos = surface->fullSize().width() * (surface->fullSize().height()) - 1;
m_pos = qMax(0, qMin(m_maxpos + 1, pos));
- if (m_pos == 0)
+ if (m_pos == 0) {
m_state = State::BEGIN;
- else if (m_pos == m_maxpos + 1)
+ updateChar();
+ } else if (m_pos == m_maxpos + 1) {
m_state = State::END;
-
- updateChar();
+ }
}
CellIterator::CellIterator(const TerminalSurface *surface)