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

GH-1874 do not allow updating while an instance is running

Browse Source 
This is a nasty hack. Proper solution will require moving all
update related functionality out of the main window.

Running instances and updating should be mutually exclusive.
This commit is contained in:
Petr Mrázek
2017-05-02 01:43:18 +02:00
parent 0132fd9929
commit 6a8bb3691b
4 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/MainWindow.cpp
View File

@ -561,14 +561,17 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
updateNewsLabel();
}
if(BuildConfig.UPDATER_ENABLED)
{
bool updatesAllowed = MMC->updatesAreAllowed();
updatesAllowedChanged(updatesAllowed);
// set up the updater object.
auto updater = MMC->updateChecker();
connect(updater.get(), &UpdateChecker::updateAvailable, this, &MainWindow::updateAvailable);
connect(updater.get(), &UpdateChecker::noUpdateFound, this, &MainWindow::updateNotAvailable);
// if automatic update checks are allowed, start one.
if (MMC->settings()->get("AutoUpdate").toBool())
if (MMC->settings()->get("AutoUpdate").toBool() && updatesAllowed)
{
updater->checkForUpdate(MMC->settings()->get("UpdateChannel").toString(), false);
}
@ -795,6 +798,15 @@ void MainWindow::repopulateAccountsMenu()
accountMenu->addAction(manageAccountsAction);
}
void MainWindow::updatesAllowedChanged(bool allowed)
{
if(!BuildConfig.UPDATER_ENABLED)
{
return;
}
ui->actionCheckUpdate->setEnabled(allowed);
}
/*
* Assumes the sender is a QAction
*/
@ -896,6 +908,11 @@ void MainWindow::updateNewsLabel()
void MainWindow::updateAvailable(GoUpdate::Status status)
{
if(!MMC->updatesAreAllowed())
{
updateNotAvailable();
return;
}
UpdateDialog dlg;
UpdateAction action = (UpdateAction)dlg.exec();
switch (action)
@ -955,6 +972,10 @@ void MainWindow::notificationsChanged()
void MainWindow::downloadUpdates(GoUpdate::Status status)
{
if(!MMC->updatesAreAllowed())
{
return;
}
qDebug() << "Downloading updates.";
ProgressDialog updateDlg(this);
status.rootPath = MMC->root();