diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-03-07 16:15:38 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-03-07 16:15:38 +0100 |
| commit | 0cc682c629a4e471495114584bb85be9c73b40ee (patch) | |
| tree | a1d20a938a11c1aa7db24cd769bdfbb6839ce1da /logic/net/PasteUpload.cpp | |
| parent | 737169d1d3ac62a7db99d51e892289aee8c1d3a3 (diff) | |
| download | MultiMC-0cc682c629a4e471495114584bb85be9c73b40ee.tar MultiMC-0cc682c629a4e471495114584bb85be9c73b40ee.tar.gz MultiMC-0cc682c629a4e471495114584bb85be9c73b40ee.tar.lz MultiMC-0cc682c629a4e471495114584bb85be9c73b40ee.tar.xz MultiMC-0cc682c629a4e471495114584bb85be9c73b40ee.zip | |
Fix a few paste upload bugs
Fixes https://www.pivotaltracker.com/story/show/66994990
Diffstat (limited to 'logic/net/PasteUpload.cpp')
| -rw-r--r-- | logic/net/PasteUpload.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp index fa54d084..402eb400 100644 --- a/logic/net/PasteUpload.cpp +++ b/logic/net/PasteUpload.cpp @@ -25,7 +25,7 @@ void PasteUpload::executeTask() m_reply = std::shared_ptr<QNetworkReply>(rep); connect(rep, &QNetworkReply::downloadProgress, [&](qint64 value, qint64 max) - { setProgress(value / max * 100); }); + { setProgress(value / qMax((qint64)1, max) * 100); }); connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError))); connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished())); @@ -52,10 +52,9 @@ void PasteUpload::downloadFinished() emitFailed(jsonError.errorString()); return; } - QString error; - if (!parseResult(doc, &error)) + if (!parseResult(doc)) { - emitFailed(error); + emitFailed(tr("paste.ee returned an error. Please consult the logs for more information")); return; } } @@ -69,13 +68,13 @@ void PasteUpload::downloadFinished() emitSucceeded(); } -bool PasteUpload::parseResult(QJsonDocument doc, QString *parseError) +bool PasteUpload::parseResult(QJsonDocument doc) { auto object = doc.object(); auto status = object.value("status").toString("error"); if (status == "error") { - parseError = new QString(object.value("error").toString()); + QLOG_ERROR() << "paste.ee reported error:" << QString(object.value("error").toString()); return false; } // FIXME: not the place for GUI things. |