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

Merge pull request #2708 from cold-brewed/media-history-fopen

Browse Source 
qt: Account for empty path in plat_fopen
This commit is contained in:
Miran Grča
2022-10-06 20:49:23 +02:00
committed by GitHub
parent 0aae6a993f 9adf5ab589
commit 42a03528fd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/qt_platform.cpp
View File

@@ -163,7 +163,7 @@ plat_fopen(const char *path, const char *mode)
{ {
#if defined(Q_OS_MACOS) or defined(Q_OS_LINUX) #if defined(Q_OS_MACOS) or defined(Q_OS_LINUX)
QFileInfo fi(path); QFileInfo fi(path);
QString filename = fi.isRelative() ? usr_path + fi.filePath() : fi.filePath(); QString filename = (fi.isRelative() && !fi.filePath().isEmpty()) ? usr_path + fi.filePath() : fi.filePath();
return fopen(filename.toUtf8().constData(), mode); return fopen(filename.toUtf8().constData(), mode);
#else #else
return fopen(QString::fromUtf8(path).toLocal8Bit(), mode); return fopen(QString::fromUtf8(path).toLocal8Bit(), mode);
@@ -175,7 +175,7 @@ plat_fopen64(const char *path, const char *mode)
{ {
#if defined(Q_OS_MACOS) or defined(Q_OS_LINUX) #if defined(Q_OS_MACOS) or defined(Q_OS_LINUX)
QFileInfo fi(path); QFileInfo fi(path);
QString filename = fi.isRelative() ? usr_path + fi.filePath() : fi.filePath(); QString filename = (fi.isRelative() && !fi.filePath().isEmpty()) ? usr_path + fi.filePath() : fi.filePath();
return fopen(filename.toUtf8().constData(), mode); return fopen(filename.toUtf8().constData(), mode);
#else #else
return fopen(QString::fromUtf8(path).toLocal8Bit(), mode); return fopen(QString::fromUtf8(path).toLocal8Bit(), mode);