Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
ff0a240d40
4 changed files with 200 additions and 170 deletions
code/ryzom/tools/client/ryzom_installer
|
@ -323,6 +323,13 @@ void CDownloader::onHeadFinished()
|
|||
}
|
||||
}
|
||||
|
||||
// error when download is not yet ready
|
||||
else if (status == 307)
|
||||
{
|
||||
if (m_listener) m_listener->operationFail(tr("File is not available, please retry later (status code: %1)").arg(status));
|
||||
return;
|
||||
}
|
||||
|
||||
// other status
|
||||
else
|
||||
{
|
||||
|
|
|
@ -51,11 +51,13 @@ bool CFilesCleaner::exec()
|
|||
QStringList filter;
|
||||
filter << "*.string_cache";
|
||||
|
||||
// certificate should be in gamedev.bnp now
|
||||
filter << "*.pem";
|
||||
|
||||
if (dir.exists("packedsheets.bnp"))
|
||||
{
|
||||
filter << "*.packed_sheets";
|
||||
filter << "*.packed";
|
||||
filter << "*.pem";
|
||||
}
|
||||
|
||||
// temporary files
|
||||
|
|
|
@ -492,6 +492,13 @@ void COperationDialog::onProgressSuccess(qint64 total)
|
|||
void COperationDialog::onProgressFail(const QString &error)
|
||||
{
|
||||
QMessageBox::critical(this, tr("Error"), error);
|
||||
|
||||
{
|
||||
QMutexLocker locker(&m_abortingMutex);
|
||||
m_aborting = true;
|
||||
}
|
||||
|
||||
processNextStep();
|
||||
}
|
||||
|
||||
void COperationDialog::onDone()
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue