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

Qt: fix double slash in updater tmp_folder

Browse source
This commit is contained in:
Megamouse 2020-03-22 17:53:18 +01:00
parent da09badd8d
commit 3c63db93ed
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/rpcs3qt/update_manager.cpp
View file

@ -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::canceled, [this]() { m_curl_abort = true; });
connect(m_progress_dialog, &QProgressDialog::finished, m_progress_dialog, &QProgressDialog::deleteLater); 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_URL, request_url.c_str());
curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curl_write_cb); curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curl_write_cb);
curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, this); curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, this);
@ -500,7 +500,7 @@ bool update_manager::handle_rpcs3()
size_t outBufferSize = 0; size_t outBufferSize = 0;
// Creates temp folder for moving active files // 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); fs::create_dir(tmp_folder);
for (UInt32 i = 0; i < db.NumFiles; i++) for (UInt32 i = 0; i < db.NumFiles; i++)

3
rpcs3/rpcs3qt/update_manager.h
View file

@ -11,9 +11,6 @@ class update_manager final : public QObject
Q_OBJECT Q_OBJECT
private: private:
const std::string m_update_url = "https://update.rpcs3.net/?api=v1&c=";
const std::string m_tmp_folder = "/rpcs3_old/";
std::atomic<bool> m_update_dialog = false; std::atomic<bool> m_update_dialog = false;
progress_dialog* m_progress_dialog = nullptr; progress_dialog* m_progress_dialog = nullptr;
QWidget* m_parent = nullptr; QWidget* m_parent = nullptr;