Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Konsole
Commits
9bb6e3fe
Commit
9bb6e3fe
authored
Sep 06, 2020
by
Martin Tobias Holmedahl Sandsmark
Browse files
Fix crash when extending selection after switching between primary and secondary screen
BUG: 398320
parent
23024d4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/ScreenWindow.cpp
View file @
9bb6e3fe
...
...
@@ -49,6 +49,11 @@ void ScreenWindow::setScreen(Screen *screen)
{
Q_ASSERT
(
screen
);
if
(
screen
==
_screen
)
{
return
;
}
emit
screenAboutToChange
();
_screen
=
screen
;
}
...
...
src/ScreenWindow.h
View file @
9bb6e3fe
...
...
@@ -257,6 +257,11 @@ Q_SIGNALS:
/** Emitted when the selection is changed. */
void
selectionChanged
();
/** Emitted when e. g. Screen is changed (to alternate or primary), so
* initial selection offsets etc. are invalidated.
*/
void
screenAboutToChange
();
private:
Q_DISABLE_COPY
(
ScreenWindow
)
...
...
src/widgets/TerminalDisplay.cpp
View file @
9bb6e3fe
...
...
@@ -139,6 +139,11 @@ void TerminalDisplay::setScreenWindow(ScreenWindow* window)
connect
(
_screenWindow
.
data
(),
&
Konsole
::
ScreenWindow
::
outputChanged
,
this
,
[
this
]()
{
_filterUpdateRequired
=
true
;
});
connect
(
_screenWindow
.
data
(),
&
Konsole
::
ScreenWindow
::
screenAboutToChange
,
this
,
[
this
]()
{
_iPntSel
=
QPoint
();
_pntSel
=
QPoint
();
_tripleSelBegin
=
QPoint
();
});
connect
(
_screenWindow
.
data
(),
&
Konsole
::
ScreenWindow
::
scrolled
,
this
,
[
this
]()
{
_filterUpdateRequired
=
true
;
});
...
...
Martin Tobias Holmedahl Sandsmark
@sandsmark
mentioned in commit
4cbe7447
·
Sep 06, 2020
mentioned in commit
4cbe7447
mentioned in commit 4cbe74476820d96421627689ac66a596381c74e5
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment