Merge pull request #2604 from Cacodemon345/cdrom-loading-fix

qt: cdrom loading fixes on Windows
This commit is contained in:
Miran Grča
2022-08-10 22:19:34 +02:00
committed by GitHub
2 changed files with 2 additions and 1 deletions

View File

@@ -257,6 +257,7 @@ image_open_abort(cdrom_t *dev)
cdrom_image_close(dev); cdrom_image_close(dev);
dev->ops = NULL; dev->ops = NULL;
dev->host_drive = 0; dev->host_drive = 0;
dev->image_path[0] = 0;
return 1; return 1;
} }

View File

@@ -167,7 +167,7 @@ plat_fopen(const char *path, const char *mode)
FILE * FILE *
plat_fopen64(const char *path, const char *mode) plat_fopen64(const char *path, const char *mode)
{ {
return fopen(path, mode); return fopen(QString::fromUtf8(path).toLocal8Bit(), mode);
} }
int int