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

VCS: Handle missing checkout jobs

Browse Source 
Handle missing checkout jobs in the checkout wizard.

Task-number: QTCREATORBUG-7082
Change-Id: I8c271ebba1edabb94b5795b2756d316324175151
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-03-13 11:26:36 +01:00
parent 273d823e6b
commit ebaecead49
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/vcsbase/basecheckoutwizard.cpp
View File

@@ -219,7 +219,6 @@ QString BaseCheckoutWizard::openProject(const QString &path, QString *errorMessa
void BaseCheckoutWizard::slotProgressPageShown() void BaseCheckoutWizard::slotProgressPageShown()
{ {
const QSharedPointer<AbstractCheckoutJob> job = createJob(d->parameterPages, &(d->checkoutPath)); const QSharedPointer<AbstractCheckoutJob> job = createJob(d->parameterPages, &(d->checkoutPath));
if (!job.isNull())
d->dialog->start(job); d->dialog->start(job);
} }

5
src/plugins/vcsbase/checkoutprogresswizardpage.cpp
View File

@@ -69,6 +69,11 @@ CheckoutProgressWizardPage::~CheckoutProgressWizardPage()
void CheckoutProgressWizardPage::start(const QSharedPointer<AbstractCheckoutJob> &job) void CheckoutProgressWizardPage::start(const QSharedPointer<AbstractCheckoutJob> &job)
{ {
if (job.isNull()) {
ui->logPlainTextEdit->setPlainText(tr("No job running, please abort."));
return;
}
QTC_ASSERT(m_state != Running, return) QTC_ASSERT(m_state != Running, return)
m_job = job; m_job = job;
connect(job.data(), SIGNAL(output(QString)), ui->logPlainTextEdit, SLOT(appendPlainText(QString))); connect(job.data(), SIGNAL(output(QString)), ui->logPlainTextEdit, SLOT(appendPlainText(QString)));