feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Assert that we are operating on non-null documents

Browse Source 
Task-number: QTCREATORBUG-26594
Change-Id: I4331c457a6360682229dbbbfd8ac3d50b44b8ead
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2021-12-06 15:42:25 +01:00
parent eba2a0520b
commit b6a996a8d5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -254,6 +254,7 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
const QList<IDocument *> openedDocuments = DocumentModel::openedDocuments(); const QList<IDocument *> openedDocuments = DocumentModel::openedDocuments();
for (IDocument *doc : openedDocuments) { for (IDocument *doc : openedDocuments) {
QTC_ASSERT(doc, continue);
auto textDocument = qobject_cast<TextEditor::TextDocument *>(doc); auto textDocument = qobject_cast<TextEditor::TextDocument *>(doc);
if (textDocument && textDocument->isModified()) { if (textDocument && textDocument->isModified()) {
@@ -518,6 +519,7 @@ void DiffEditorPluginPrivate::updateDiffCurrentFileAction()
void DiffEditorPluginPrivate::updateDiffOpenFilesAction() void DiffEditorPluginPrivate::updateDiffOpenFilesAction()
{ {
const bool enabled = Utils::anyOf(DocumentModel::openedDocuments(), [](IDocument *doc) { const bool enabled = Utils::anyOf(DocumentModel::openedDocuments(), [](IDocument *doc) {
QTC_ASSERT(doc, return false);
return doc->isModified() && qobject_cast<TextEditor::TextDocument *>(doc); return doc->isModified() && qobject_cast<TextEditor::TextDocument *>(doc);
}); });
m_diffOpenFilesAction->setEnabled(enabled); m_diffOpenFilesAction->setEnabled(enabled);