archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 06:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: don't deleteLater the progress_dialog

Browse source 
It's already deleted on close by Qt anyway.
Also, remove QObject from curl_handle.
This commit is contained in:
Megamouse 2024-03-08 18:01:26 +01:00
parent adc8a360ad
commit 3056a4db83
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/rpcs3qt/curl_handle.cpp
View file

@ -1,3 +1,4 @@
#include "stdafx.h"
#include "curl_handle.h" #include "curl_handle.h"
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"
#include "util/logs.hpp" #include "util/logs.hpp"
@ -11,7 +12,7 @@ LOG_CHANNEL(network_log, "NET");
namespace rpcs3::curl namespace rpcs3::curl
{ {
curl_handle::curl_handle(QObject* parent) : QObject(parent) curl_handle::curl_handle()
{ {
reset_error_buffer(); reset_error_buffer();
@ -48,7 +49,7 @@ void curl_handle::reset_error_buffer()
m_error_buffer[0] = 0; m_error_buffer[0] = 0;
} }
std::string curl_handle::get_verbose_error(CURLcode code) std::string curl_handle::get_verbose_error(CURLcode code) const
{ {
if (m_uses_error_buffer) if (m_uses_error_buffer)
{ {

7
rpcs3/rpcs3qt/curl_handle.h
View file

@ -1,7 +1,6 @@
#pragma once #pragma once
#include <array> #include <array>
#include <QObject>
#ifndef CURL_STATICLIB #ifndef CURL_STATICLIB
#define CURL_STATICLIB #define CURL_STATICLIB
@ -12,10 +11,10 @@ namespace rpcs3::curl
{ {
inline bool g_curl_verbose = false; inline bool g_curl_verbose = false;
class curl_handle : public QObject class curl_handle
{ {
public: public:
explicit curl_handle(QObject* parent = nullptr); explicit curl_handle();
~curl_handle(); ~curl_handle();
CURL* get_curl() const; CURL* get_curl() const;
@ -26,7 +25,7 @@ public:
} }
void reset_error_buffer(); void reset_error_buffer();
std::string get_verbose_error(CURLcode code); std::string get_verbose_error(CURLcode code) const;
private: private:
CURL* m_curl = nullptr; CURL* m_curl = nullptr;

9
rpcs3/rpcs3qt/downloader.cpp
View file

@ -18,7 +18,7 @@ usz curl_write_cb_compat(char* ptr, usz /*size*/, usz nmemb, void* userdata)
downloader::downloader(QWidget* parent) downloader::downloader(QWidget* parent)
: QObject(parent) : QObject(parent)
, m_parent(parent) , m_parent(parent)
, m_curl(new rpcs3::curl::curl_handle(this)) , m_curl(new rpcs3::curl::curl_handle())
{ {
} }
@ -85,10 +85,9 @@ void downloader::start(const std::string& url, bool follow_location, bool show_p
return; return;
} }
if (m_progress_dialog && (!m_keep_progress_dialog_open || !m_curl_success)) if (!m_keep_progress_dialog_open || !m_curl_success)
{ {
m_progress_dialog->close(); close_progress_dialog();
m_progress_dialog = nullptr;
} }
if (m_curl_success) if (m_curl_success)
@ -126,7 +125,7 @@ void downloader::start(const std::string& url, bool follow_location, bool show_p
close_progress_dialog(); close_progress_dialog();
Q_EMIT signal_download_canceled(); Q_EMIT signal_download_canceled();
}); });
connect(m_progress_dialog, &QProgressDialog::finished, m_progress_dialog, &QProgressDialog::deleteLater); connect(m_progress_dialog, &QProgressDialog::finished, this, &downloader::close_progress_dialog);
} }
} }

6
rpcs3/rpcs3qt/downloader.h
View file

@ -25,10 +25,12 @@ public:
usz update_buffer(char* data, usz size); usz update_buffer(char* data, usz size);
void update_progress_dialog(const QString& title) const; void update_progress_dialog(const QString& title) const;
void close_progress_dialog();
progress_dialog* get_progress_dialog() const; progress_dialog* get_progress_dialog() const;
public Q_SLOTS:
void close_progress_dialog();
private Q_SLOTS: private Q_SLOTS:
void handle_buffer_update(int size, int max) const; void handle_buffer_update(int size, int max) const;
@ -41,7 +43,7 @@ Q_SIGNALS:
private: private:
QWidget* m_parent = nullptr; QWidget* m_parent = nullptr;
rpcs3::curl::curl_handle* m_curl = nullptr; std::unique_ptr<rpcs3::curl::curl_handle> m_curl;
QByteArray m_curl_buf; QByteArray m_curl_buf;
atomic_t<bool> m_curl_abort = false; atomic_t<bool> m_curl_abort = false;
atomic_t<bool> m_curl_success = false; atomic_t<bool> m_curl_success = false;