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

CodePaster: Do not crash in case of invalid default protocol

Browse Source 
Task-number: QTCREATORBUG-12364
Change-Id: I6e9bf75dd6b8df187a6802e9d90c3d986cc86a5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Eike Ziller
2014-06-06 15:25:55 +02:00
parent b90452e309
commit cc64529fc4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpaster/pasteview.cpp
View File

@@ -31,6 +31,7 @@
#include "protocol.h" #include "protocol.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/qtcassert.h>
#include <QPushButton> #include <QPushButton>
#include <QSettings> #include <QSettings>
@@ -112,6 +113,7 @@ void PasteView::contentChanged()
void PasteView::protocolChanged(int p) void PasteView::protocolChanged(int p)
{ {
QTC_ASSERT(p >= 0 && p < m_protocols.size(), return);
const unsigned caps = m_protocols.at(p)->capabilities(); const unsigned caps = m_protocols.at(p)->capabilities();
m_ui.uiDescription->setEnabled(caps & Protocol::PostDescriptionCapability); m_ui.uiDescription->setEnabled(caps & Protocol::PostDescriptionCapability);
m_ui.uiUsername->setEnabled(caps & Protocol::PostUserNameCapability); m_ui.uiUsername->setEnabled(caps & Protocol::PostUserNameCapability);
@@ -215,6 +217,8 @@ void PasteView::accept()
void PasteView::setProtocol(const QString &protocol) void PasteView::setProtocol(const QString &protocol)
{ {
const int index = m_ui.protocolBox->findText(protocol); const int index = m_ui.protocolBox->findText(protocol);
if (index < 0)
return;
m_ui.protocolBox->setCurrentIndex(index); m_ui.protocolBox->setCurrentIndex(index);
if (index == m_ui.protocolBox->currentIndex()) if (index == m_ui.protocolBox->currentIndex())
protocolChanged(index); // Force enabling protocolChanged(index); // Force enabling