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

CodePaster: Do not leak the test reply, do not show empty message.

Browse Source 
... on canceling.
This commit is contained in:
Friedemann Kleint
2010-08-20 17:31:37 +02:00
parent 94babbd9ca
commit 8a91d7f68c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpaster/protocol.cpp
View File

@@ -128,7 +128,8 @@ bool Protocol::ensureConfiguration(Protocol *p, QWidget *parent)
ok = true; ok = true;
break; break;
} }
if (!showConfigurationError(p, errorMessage, parent)) // Cancel returns empty error message.
if (errorMessage.isEmpty() || !showConfigurationError(p, errorMessage, parent))
break; break;
} }
return ok; return ok;
@@ -209,19 +210,20 @@ bool NetworkProtocol::httpStatus(QString url, QString *errorMessage)
url.prepend(httpPrefix); url.prepend(httpPrefix);
url.append(QLatin1Char('/')); url.append(QLatin1Char('/'));
} }
QNetworkReply *reply = httpGet(url); QScopedPointer<QNetworkReply> reply(httpGet(url));
QMessageBox box(QMessageBox::Information, QMessageBox box(QMessageBox::Information,
tr("Checking connection"), tr("Checking connection"),
tr("Connecting to %1...").arg(url), tr("Connecting to %1...").arg(url),
QMessageBox::Cancel, QMessageBox::Cancel,
Core::ICore::instance()->mainWindow()); Core::ICore::instance()->mainWindow());
connect(reply, SIGNAL(finished()), &box, SLOT(close())); connect(reply.data(), SIGNAL(finished()), &box, SLOT(close()));
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
box.exec(); box.exec();
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
// User canceled, discard and be happy. // User canceled, discard and be happy.
if (!reply->isFinished()) { if (!reply->isFinished()) {
connect(reply, SIGNAL(finished()), reply, SLOT(deleteLater())); QNetworkReply *replyPtr = reply.take();
connect(replyPtr, SIGNAL(finished()), replyPtr, SLOT(deleteLater()));
return false; return false;
} }
// Passed // Passed