From 3c63db93edec58febbe2d16b67b602efbdf74c22 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 22 Mar 2020 17:53:18 +0100 Subject: [PATCH] Qt: fix double slash in updater tmp_folder --- rpcs3/rpcs3qt/update_manager.cpp | 4 ++-- rpcs3/rpcs3qt/update_manager.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp index 02f382d767..ee32860de4 100644 --- a/rpcs3/rpcs3qt/update_manager.cpp +++ b/rpcs3/rpcs3qt/update_manager.cpp @@ -107,7 +107,7 @@ void update_manager::check_for_updates(bool automatic, QWidget* parent) connect(m_progress_dialog, &QProgressDialog::canceled, [this]() { m_curl_abort = true; }); connect(m_progress_dialog, &QProgressDialog::finished, m_progress_dialog, &QProgressDialog::deleteLater); - const std::string request_url = m_update_url + rpcs3::get_commit_and_hash().second; + const std::string request_url = "https://update.rpcs3.net/?api=v1&c=" + rpcs3::get_commit_and_hash().second; curl_easy_setopt(m_curl, CURLOPT_URL, request_url.c_str()); curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curl_write_cb); curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, this); @@ -500,7 +500,7 @@ bool update_manager::handle_rpcs3() size_t outBufferSize = 0; // Creates temp folder for moving active files - const std::string tmp_folder = Emulator::GetEmuDir() + m_tmp_folder; + const std::string tmp_folder = Emulator::GetEmuDir() + "rpcs3_old/"; fs::create_dir(tmp_folder); for (UInt32 i = 0; i < db.NumFiles; i++) diff --git a/rpcs3/rpcs3qt/update_manager.h b/rpcs3/rpcs3qt/update_manager.h index 0946903688..0b4a21974d 100644 --- a/rpcs3/rpcs3qt/update_manager.h +++ b/rpcs3/rpcs3qt/update_manager.h @@ -11,9 +11,6 @@ class update_manager final : public QObject Q_OBJECT private: - const std::string m_update_url = "https://update.rpcs3.net/?api=v1&c="; - const std::string m_tmp_folder = "/rpcs3_old/"; - std::atomic m_update_dialog = false; progress_dialog* m_progress_dialog = nullptr; QWidget* m_parent = nullptr;