Merge pull request #2604 from Cacodemon345/cdrom-loading-fix
qt: cdrom loading fixes on Windows
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user