ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11576 from yannhodiesne/convert-prevent-file-deletion 

Check the input and destination paths before converting a game file onto itself
This commit is contained in:
Admiral H. Curtiss 2023-02-17 18:49:15 +01:00 committed by GitHub
parent b381df700c 49e897422f
commit 74abf48234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/DolphinQt/ConvertDialog.cpp
View File

@ -4,6 +4,7 @@
#include "DolphinQt/ConvertDialog.h"
#include <algorithm>
#include <filesystem>
#include <functional>
#include <future>
#include <memory>
@ -22,6 +23,7 @@
#include "Common/Assert.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "DiscIO/Blob.h"
#include "DiscIO/DiscUtils.h"
#include "DiscIO/ScrubbedBlob.h"
@ -385,6 +387,8 @@ void ConvertDialog::Convert()
return;
}
int success_count = 0;
for (const auto& file : m_files)
{
const auto original_path = file->GetFilePath();
@ -410,6 +414,21 @@ void ConvertDialog::Convert()
}
}
if (std::filesystem::exists(StringToPath(dst_path.toStdString())))
{
std::error_code ec;
if (std::filesystem::equivalent(StringToPath(dst_path.toStdString()),
StringToPath(original_path), ec))
{
ModalMessageBox::critical(
this, tr("Error"),
tr("The destination file cannot be the same as the source file\n\n"
"Please select another destination path for \"%1\"")
.arg(QString::fromStdString(original_path)));
continue;
}
}
ParallelProgressDialog progress_dialog(tr("Converting..."), tr("Abort"), 0, 100, this);
progress_dialog.GetRaw()->setWindowModality(Qt::WindowModal);
progress_dialog.GetRaw()->setWindowTitle(tr("Progress"));
@ -507,11 +526,13 @@ void ConvertDialog::Convert()
tr("Dolphin failed to complete the requested action."));
return;
}
success_count++;
}
}
ModalMessageBox::information(this, tr("Success"),
tr("Successfully converted %n image(s).", "", m_files.size()));
tr("Successfully converted %n image(s).", "", success_count));
close();
}