80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Media history: Fixed the handling of relative paths.

Browse Source
This commit is contained in:
OBattler
2024-08-27 03:02:42 +02:00
parent 7c7cc921ee
commit 208b213aac
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/qt/qt_mediahistorymanager.cpp
View File

@@ -26,6 +26,7 @@ extern "C" {
#include <86box/timer.h> #include <86box/timer.h>
#include <86box/cdrom.h> #include <86box/cdrom.h>
#include <86box/fdd.h> #include <86box/fdd.h>
#include <86box/path.h>
} }
namespace ui { namespace ui {
@@ -275,9 +276,6 @@ MediaHistoryManager::pathAdjustSingle(QString checked_path)
if (file_info.filePath().isEmpty() || current_usr_path.isEmpty() || file_info.isRelative()) { if (file_info.filePath().isEmpty() || current_usr_path.isEmpty() || file_info.isRelative()) {
return checked_path; return checked_path;
} }
if (file_info.filePath().startsWith(current_usr_path)) {
checked_path = file_info.filePath().remove(current_usr_path);
}
return checked_path; return checked_path;
} }
@@ -304,10 +302,25 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
if (file_info.filePath().isEmpty()) { if (file_info.filePath().isEmpty()) {
continue; continue;
} }
// For this check, explicitly prepend `usr_path` to relative paths to account for $CWD platform variances
QFileInfo absolute_path = file_info.isRelative() ? QFileInfo(getUsrPath().append(file_info.filePath())) : file_info; char *p = checked_path.toUtf8().data();
if ((file_info.filePath().left(8) != "ioctl://") && !absolute_path.exists()) { char temp[1024] = { 0 };
qWarning("Image file %s does not exist - removing from history", qPrintable(file_info.filePath()));
if (path_abs(p)) {
if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
fatal("removeMissingImages(): strlen(p) > 2047\n");
else
snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", p);
} else
snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
path_get_slash(usr_path), p);
path_normalize(temp);
QString qstr = QString::fromUtf8(temp);
QFileInfo new_fi(qstr);
if ((new_fi.filePath().left(8) != "ioctl://") && !new_fi.exists()) {
qWarning("Image file %s does not exist - removing from history", qPrintable(new_fi.filePath()));
checked_path = ""; checked_path = "";
} }
} }