Skip to content

Commit 09e7855

Browse files
committed
Qt: Fix updater download size display
1 parent 45a2257 commit 09e7855

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

src/duckstation-qt/autoupdaterwindow.cpp

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,31 @@ void AutoUpdaterWindow::getLatestReleaseComplete(s32 status_code, const Error& e
381381
{
382382
const QJsonObject doc_object(doc.object());
383383

384+
#ifdef AUTO_UPDATER_SUPPORTED
385+
// search for the correct file
386+
const QJsonArray assets(doc_object["assets"].toArray());
387+
const QString asset_filename(UPDATE_ASSET_FILENAME);
388+
bool asset_found = false;
389+
for (const QJsonValue& asset : assets)
390+
{
391+
const QJsonObject asset_obj(asset.toObject());
392+
if (asset_obj["name"] == asset_filename)
393+
{
394+
m_download_url = asset_obj["browser_download_url"].toString();
395+
if (!m_download_url.isEmpty())
396+
m_download_size = asset_obj["size"].toInt();
397+
asset_found = true;
398+
break;
399+
}
400+
}
401+
402+
if (!asset_found)
403+
{
404+
reportError("Asset/asset download not found");
405+
return;
406+
}
407+
#endif
408+
384409
const QString current_date = QtHost::FormatNumber(
385410
Host::NumberFormatType::ShortDateTime,
386411
static_cast<s64>(
@@ -407,30 +432,7 @@ void AutoUpdaterWindow::getLatestReleaseComplete(s32 status_code, const Error& e
407432
m_ui.downloadSize->setText(
408433
tr("Download Size: %1 MB").arg(static_cast<double>(m_download_size) / 1000000.0, 0, 'f', 2));
409434

410-
#ifdef AUTO_UPDATER_SUPPORTED
411-
// search for the correct file
412-
const QJsonArray assets(doc_object["assets"].toArray());
413-
const QString asset_filename(UPDATE_ASSET_FILENAME);
414-
bool asset_found = false;
415-
for (const QJsonValue& asset : assets)
416-
{
417-
const QJsonObject asset_obj(asset.toObject());
418-
if (asset_obj["name"] == asset_filename)
419-
{
420-
m_download_url = asset_obj["browser_download_url"].toString();
421-
if (!m_download_url.isEmpty())
422-
m_download_size = asset_obj["size"].toInt();
423-
asset_found = true;
424-
break;
425-
}
426-
}
427-
428-
if (!asset_found)
429-
{
430-
reportError("Asset/asset download not found");
431-
return;
432-
}
433-
#else
435+
#ifndef AUTO_UPDATER_SUPPORTED
434436
// Just display the version and a download link.
435437
m_ui.downloadAndInstall->setText(tr("Download..."));
436438
#endif

0 commit comments

Comments
 (0)