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
Kate
Commits
d8537367
Commit
d8537367
authored
Feb 22, 2021
by
Waqar Ahmed
Committed by
Christoph Cullmann
Feb 24, 2021
Browse files
Fix crashes with temporary files
parent
b1a7f281
Changes
2
Hide whitespace changes
Inline
Side-by-side
addons/project/gitwidget.cpp
View file @
d8537367
...
...
@@ -37,7 +37,6 @@
#include <KTextEditor/Message>
#include <KTextEditor/View>
GitWidget
::
GitWidget
(
KateProject
*
project
,
KTextEditor
::
MainWindow
*
mainWindow
,
KateProjectPluginView
*
pluginView
)
:
m_project
(
project
)
,
m_mainWin
(
mainWindow
)
...
...
@@ -272,12 +271,15 @@ void GitWidget::openAtHEAD(const QString &file)
// close temp on document close
auto
clearTemp
=
[
this
](
KTextEditor
::
Document
*
document
)
{
std
::
remove_if
(
m_filesOpenAtHEAD
.
begin
(),
m_filesOpenAtHEAD
.
end
(),
[
document
](
const
GitWidget
::
TempFileViewPair
&
tf
)
{
if
(
tf
.
second
->
document
()
==
document
)
{
return
true
;
}
return
false
;
});
m_filesOpenAtHEAD
.
erase
(
std
::
remove_if
(
m_filesOpenAtHEAD
.
begin
(),
m_filesOpenAtHEAD
.
end
(),
[
document
](
const
GitWidget
::
TempFileViewPair
&
tf
)
{
if
(
tf
.
second
&&
tf
.
second
->
document
()
==
document
)
{
return
true
;
}
return
false
;
}),
m_filesOpenAtHEAD
.
end
());
};
connect
(
v
->
document
(),
&
KTextEditor
::
Document
::
aboutToClose
,
this
,
clearTemp
);
}
...
...
@@ -328,12 +330,15 @@ void GitWidget::showDiff(const QString &file, bool staged)
// close temp on document close
auto
clearTemp
=
[
this
](
KTextEditor
::
Document
*
document
)
{
std
::
remove_if
(
m_filesOpenAtHEAD
.
begin
(),
m_filesOpenAtHEAD
.
end
(),
[
document
](
const
GitWidget
::
TempFileViewPair
&
tf
)
{
if
(
tf
.
second
->
document
()
==
document
)
{
return
true
;
}
return
false
;
});
m_filesOpenAtHEAD
.
erase
(
std
::
remove_if
(
m_filesOpenAtHEAD
.
begin
(),
m_filesOpenAtHEAD
.
end
(),
[
document
](
const
GitWidget
::
TempFileViewPair
&
tf
)
{
if
(
tf
.
second
&&
tf
.
second
->
document
()
==
document
)
{
return
true
;
}
return
false
;
}),
m_filesOpenAtHEAD
.
end
());
};
connect
(
v
->
document
(),
&
KTextEditor
::
Document
::
aboutToClose
,
this
,
clearTemp
);
}
...
...
addons/project/stashdialog.cpp
View file @
d8537367
...
...
@@ -468,12 +468,15 @@ void StashDialog::showStash(const QByteArray &index)
// close temp on document close
auto
clearTemp
=
[
gitWidget
](
KTextEditor
::
Document
*
document
)
{
auto
tempFiles
=
gitWidget
->
tempFilesVector
();
std
::
remove_if
(
tempFiles
->
begin
(),
tempFiles
->
end
(),
[
document
](
const
GitWidget
::
TempFileViewPair
&
tf
)
{
if
(
tf
.
second
->
document
()
==
document
)
{
return
true
;
}
return
false
;
});
tempFiles
->
erase
(
std
::
remove_if
(
tempFiles
->
begin
(),
tempFiles
->
end
(),
[
document
](
const
GitWidget
::
TempFileViewPair
&
tf
)
{
if
(
tf
.
second
->
document
()
==
document
)
{
return
true
;
}
return
false
;
}),
tempFiles
->
end
());
};
connect
(
v
->
document
(),
&
KTextEditor
::
Document
::
aboutToClose
,
gitWidget
,
clearTemp
);
}
...
...
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