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

Merge branch '86Box:master' into nec-v20

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-08-10 23:58:27 -04:00
committed by GitHub
parent eabf8b7e6c bf8d1dda9d
commit f80f8f377a
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cdrom/cdrom_image.c
View File

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

2
src/qt/qt_platform.cpp
View File

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

2
src/qt/qt_renderercommon.cpp
View File

@@ -47,7 +47,7 @@ static void integer_scale(double *d, double *g) {
}
void RendererCommon::onResize(int width, int height) {
if (video_fullscreen == 0 && video_fullscreen_scale_maximized ? (parentWidget->isMaximized() == false && (main_window->isAncestorOf(parentWidget) && main_window->isMaximized() == false)) : 1) {
if ((video_fullscreen == 0) && (video_fullscreen_scale_maximized ? ((parentWidget->isMaximized() == false) && (main_window->isAncestorOf(parentWidget) && main_window->isMaximized() == false)) : 1)) {
destination.setRect(0, 0, width, height);
return;
}