mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 17:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: remove automatic param from update logic

Browse Source 
At that point we already had user interaction, so there is no point in hiding the error dialogs
This commit is contained in:
Megamouse 2020-07-02 23:21:12 +02:00
parent 72337f2678
commit 78eb7e73bc
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/rpcs3qt/main_window.cpp
View File

@ -186,7 +186,7 @@ void main_window::Init()
QAction *download_action = new QAction(tr("Download Update"), download_menu); QAction *download_action = new QAction(tr("Download Update"), download_menu);
connect(download_action, &QAction::triggered, this, [this] connect(download_action, &QAction::triggered, this, [this]
{ {
m_updater.update(false); m_updater.update();
}); });
download_menu->addAction(download_action); download_menu->addAction(download_action);

18
rpcs3/rpcs3qt/update_manager.cpp
View File

@ -199,11 +199,11 @@ bool update_manager::handle_json(bool automatic, bool check_only, const QByteArr
return true; return true;
} }
update(automatic); update();
return true; return true;
} }
void update_manager::update(bool automatic) void update_manager::update()
{ {
if (QMessageBox::question(m_downloader->get_progress_dialog(), tr("Update Available"), m_update_message, QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) if (QMessageBox::question(m_downloader->get_progress_dialog(), tr("Update Available"), m_update_message, QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
{ {
@ -213,15 +213,12 @@ void update_manager::update(bool automatic)
m_downloader->disconnect(); m_downloader->disconnect();
connect(m_downloader, &downloader::signal_download_error, this, [this, automatic](const QString& /*error*/) connect(m_downloader, &downloader::signal_download_error, this, [this](const QString& /*error*/)
{ {
if (!automatic) QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occurred during the auto-updating process.\nCheck the log for more information."));
{
QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occurred during the auto-updating process.\nCheck the log for more information."));
}
}); });
connect(m_downloader, &downloader::signal_download_finished, this, [this, automatic](const QByteArray& data) connect(m_downloader, &downloader::signal_download_finished, this, [this](const QByteArray& data)
{ {
const bool result_json = handle_rpcs3(data); const bool result_json = handle_rpcs3(data);
@ -230,10 +227,7 @@ void update_manager::update(bool automatic)
// The progress dialog is configured to stay open, so we need to close it manually if the download succeeds. // The progress dialog is configured to stay open, so we need to close it manually if the download succeeds.
m_downloader->close_progress_dialog(); m_downloader->close_progress_dialog();
if (!automatic) QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occurred during the auto-updating process.\nCheck the log for more information."));
{
QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occurred during the auto-updating process.\nCheck the log for more information."));
}
} }
Q_EMIT signal_update_available(false); Q_EMIT signal_update_available(false);

2
rpcs3/rpcs3qt/update_manager.h
View File

@ -26,7 +26,7 @@ private:
public: public:
update_manager(); update_manager();
void check_for_updates(bool automatic, bool check_only, QWidget* parent = nullptr); void check_for_updates(bool automatic, bool check_only, QWidget* parent = nullptr);
void update(bool automatic); void update();
Q_SIGNALS: Q_SIGNALS:
void signal_update_available(bool update_available); void signal_update_available(bool update_available);