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

Git: Add some null protections

Browse Source 
Change-Id: Ia28c70690c6f79499fb8075935ec123b763bcc01
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Orgad Shaneh
2013-07-01 23:20:55 +03:00
committed by Jarek Kobus
parent 5f131da166
commit 00337585ab
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/gitclient.cpp
View File

@@ -255,6 +255,8 @@ void GitDiffHandler::show(const QString &id)
void GitDiffHandler::collectShowDescription(const QString &id) void GitDiffHandler::collectShowDescription(const QString &id)
{ {
if (m_editor.isNull())
return;
m_editor->clear(m_waitMessage); m_editor->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(m_gitPath, m_workingDirectory, m_processEnvironment); VcsBase::Command *command = new VcsBase::Command(m_gitPath, m_workingDirectory, m_processEnvironment);
connect(command, SIGNAL(outputData(QByteArray)), this, SLOT(slotShowDescriptionReceived(QByteArray))); connect(command, SIGNAL(outputData(QByteArray)), this, SLOT(slotShowDescriptionReceived(QByteArray)));
@@ -267,12 +269,13 @@ void GitDiffHandler::collectShowDescription(const QString &id)
void GitDiffHandler::slotShowDescriptionReceived(const QByteArray &data) void GitDiffHandler::slotShowDescriptionReceived(const QByteArray &data)
{ {
if (m_editor.isNull())
return;
const QString description = m_editor->editorWidget()->codec()->toUnicode(data).remove(QLatin1Char('\r')); const QString description = m_editor->editorWidget()->codec()->toUnicode(data).remove(QLatin1Char('\r'));
DiffEditor::DiffShowEditor *editor = qobject_cast<DiffEditor::DiffShowEditor *>(m_editor); DiffEditor::DiffShowEditor *editor = qobject_cast<DiffEditor::DiffShowEditor *>(m_editor);
if (editor) { if (editor)
editor->setDescription(description); editor->setDescription(description);
}
collectFilesList(QStringList() collectFilesList(QStringList()
<< m_requestedRevisionRange.begin.id << m_requestedRevisionRange.begin.id
@@ -281,6 +284,8 @@ void GitDiffHandler::slotShowDescriptionReceived(const QByteArray &data)
void GitDiffHandler::collectFilesList(const QStringList &additionalArguments) void GitDiffHandler::collectFilesList(const QStringList &additionalArguments)
{ {
if (m_editor.isNull())
return;
m_editor->clear(m_waitMessage); m_editor->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(m_gitPath, m_workingDirectory, m_processEnvironment); VcsBase::Command *command = new VcsBase::Command(m_gitPath, m_workingDirectory, m_processEnvironment);
connect(command, SIGNAL(outputData(QByteArray)), this, SLOT(slotFileListReceived(QByteArray))); connect(command, SIGNAL(outputData(QByteArray)), this, SLOT(slotFileListReceived(QByteArray)));