Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix non-auto-update-enabled builds

Browse source
This commit is contained in:
Connor McLaughlin 2020-08-06 22:22:35 +10:00
parent c2a60b766d
commit 72053e5500
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/duckstation-qt/autoupdaterdialog.cpp
View file

@ -41,12 +41,6 @@ static constexpr char LATEST_RELEASE_URL[] =
"https://api.github.com/repos/stenzek/duckstation/releases/tags/" SCM_RELEASE_TAG; "https://api.github.com/repos/stenzek/duckstation/releases/tags/" SCM_RELEASE_TAG;
static constexpr char UPDATE_ASSET_FILENAME[] = SCM_RELEASE_ASSET; static constexpr char UPDATE_ASSET_FILENAME[] = SCM_RELEASE_ASSET;
#else
static constexpr char LATEST_TAG_URL[] = "";
static constexpr char LATEST_RELEASE_URL[] = "";
static constexpr char UPDATE_ASSET_FILENAME[] = "";
#endif #endif
AutoUpdaterDialog::AutoUpdaterDialog(QtHostInterface* host_interface, QWidget* parent /* = nullptr */) AutoUpdaterDialog::AutoUpdaterDialog(QtHostInterface* host_interface, QWidget* parent /* = nullptr */)
@ -89,28 +83,35 @@ void AutoUpdaterDialog::reportError(const char* msg, ...)
void AutoUpdaterDialog::queueUpdateCheck(bool display_message) void AutoUpdaterDialog::queueUpdateCheck(bool display_message)
{ {
m_display_messages = display_message;
#ifdef AUTO_UPDATER_SUPPORTED
connect(m_network_access_mgr, &QNetworkAccessManager::finished, this, &AutoUpdaterDialog::getLatestTagComplete); connect(m_network_access_mgr, &QNetworkAccessManager::finished, this, &AutoUpdaterDialog::getLatestTagComplete);
QUrl url(QUrl::fromEncoded(QByteArray(LATEST_TAG_URL, sizeof(LATEST_TAG_URL) - 1))); QUrl url(QUrl::fromEncoded(QByteArray(LATEST_TAG_URL, sizeof(LATEST_TAG_URL) - 1)));
QNetworkRequest request(url); QNetworkRequest request(url);
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
m_network_access_mgr->get(request); m_network_access_mgr->get(request);
#else
m_display_messages = display_message; emit updateCheckCompleted();
#endif
} }
void AutoUpdaterDialog::queueGetLatestRelease() void AutoUpdaterDialog::queueGetLatestRelease()
{ {
#ifdef AUTO_UPDATER_SUPPORTED
connect(m_network_access_mgr, &QNetworkAccessManager::finished, this, &AutoUpdaterDialog::getLatestReleaseComplete); connect(m_network_access_mgr, &QNetworkAccessManager::finished, this, &AutoUpdaterDialog::getLatestReleaseComplete);
QUrl url(QUrl::fromEncoded(QByteArray(LATEST_RELEASE_URL, sizeof(LATEST_RELEASE_URL) - 1))); QUrl url(QUrl::fromEncoded(QByteArray(LATEST_RELEASE_URL, sizeof(LATEST_RELEASE_URL) - 1)));
QNetworkRequest request(url); QNetworkRequest request(url);
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
m_network_access_mgr->get(request); m_network_access_mgr->get(request);
#endif
} }
void AutoUpdaterDialog::getLatestTagComplete(QNetworkReply* reply) void AutoUpdaterDialog::getLatestTagComplete(QNetworkReply* reply)
{ {
#ifdef AUTO_UPDATER_SUPPORTED
// this might fail due to a lack of internet connection - in which case, don't spam the user with messages every time. // this might fail due to a lack of internet connection - in which case, don't spam the user with messages every time.
m_network_access_mgr->disconnect(this); m_network_access_mgr->disconnect(this);
reply->deleteLater(); reply->deleteLater();
@ -166,10 +167,12 @@ void AutoUpdaterDialog::getLatestTagComplete(QNetworkReply* reply)
} }
emit updateCheckCompleted(); emit updateCheckCompleted();
#endif
} }
void AutoUpdaterDialog::getLatestReleaseComplete(QNetworkReply* reply) void AutoUpdaterDialog::getLatestReleaseComplete(QNetworkReply* reply)
{ {
#ifdef AUTO_UPDATER_SUPPORTED
m_network_access_mgr->disconnect(this); m_network_access_mgr->disconnect(this);
reply->deleteLater(); reply->deleteLater();
@ -217,8 +220,7 @@ void AutoUpdaterDialog::getLatestReleaseComplete(QNetworkReply* reply)
{ {
reportError("Failed to download latest release info: %d", static_cast<int>(reply->error())); reportError("Failed to download latest release info: %d", static_cast<int>(reply->error()));
} }
#endif
emit updateCheckCompleted();
} }
void AutoUpdaterDialog::downloadUpdateClicked() void AutoUpdaterDialog::downloadUpdateClicked()