CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show changelog even when there are no new updates available.

Browse Source
This commit is contained in:
Petr Mrázek
2014-07-14 00:57:54 +02:00
parent d8d6f5929b
commit 3821569363
9 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logic/updater/DownloadUpdateTask.cpp
View File

@ -91,7 +91,7 @@ void DownloadUpdateTask::findCurrentVersionInfo()
QObject::connect(checker.get(), &UpdateChecker::channelListLoaded, this,
&DownloadUpdateTask::processChannels);
checker->updateChanList();
checker->updateChanList(false);
}
else
{

11
logic/updater/UpdateChecker.cpp
View File

@ -59,7 +59,7 @@ void UpdateChecker::checkForUpdate(bool notifyNoUpdate)
QLOG_DEBUG() << "Channel list isn't loaded yet. Loading channel list and deferring "
"update check.";
m_checkUpdateWaiting = true;
updateChanList();
updateChanList(notifyNoUpdate);
return;
}
@ -170,7 +170,7 @@ void UpdateChecker::updateCheckFailed()
QLOG_ERROR() << "Update check failed for reasons unknown.";
}
void UpdateChecker::updateChanList()
void UpdateChecker::updateChanList(bool notifyNoUpdate)
{
QLOG_DEBUG() << "Loading the channel list.";
@ -185,13 +185,14 @@ void UpdateChecker::updateChanList()
m_chanListLoading = true;
NetJob *job = new NetJob("Update System Channel List");
job->addNetAction(ByteArrayDownload::make(QUrl(m_channelListUrl)));
QObject::connect(job, &NetJob::succeeded, this, &UpdateChecker::chanListDownloadFinished);
connect(job, &NetJob::succeeded, [this, notifyNoUpdate]()
{ chanListDownloadFinished(notifyNoUpdate); });
QObject::connect(job, &NetJob::failed, this, &UpdateChecker::chanListDownloadFailed);
chanListJob.reset(job);
job->start();
}
void UpdateChecker::chanListDownloadFinished()
void UpdateChecker::chanListDownloadFinished(bool notifyNoUpdate)
{
QByteArray data;
{
@ -250,7 +251,7 @@ void UpdateChecker::chanListDownloadFinished()
// If we're waiting to check for updates, do that now.
if (m_checkUpdateWaiting)
checkForUpdate(false);
checkForUpdate(notifyNoUpdate);
emit channelListLoaded();
}

4
logic/updater/UpdateChecker.h
View File

@ -33,7 +33,7 @@ public:
* Causes the update checker to download the channel list from the URL specified in config.h (generated by CMake).
* If this isn't called before checkForUpdate(), it will automatically be called.
*/
void updateChanList();
void updateChanList(bool notifyNoUpdate);
/*!
* An entry in the channel list.
@ -70,7 +70,7 @@ private slots:
void updateCheckFinished(bool notifyNoUpdate);
void updateCheckFailed();
void chanListDownloadFinished();
void chanListDownloadFinished(bool notifyNoUpdate);
void chanListDownloadFailed();
private: