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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2022-08-10 22:44:22 +02:00
parent ee38432bb7 352f71a506
commit bf8d1dda9d
3 changed files with 3 additions and 1 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); 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;
} }

1
src/qt/qt_d3d9renderer.cpp
View File

@@ -108,6 +108,7 @@ void D3D9Renderer::paintEvent(QPaintEvent *event)
dstRect.left = destination.left(); dstRect.left = destination.left();
dstRect.right = destination.right(); dstRect.right = destination.right();
d3d9dev->BeginScene(); d3d9dev->BeginScene();
d3d9dev->Clear(0, nullptr, D3DCLEAR_TARGET, 0xFF000000, 0, 0);
while (surfaceInUse) {} while (surfaceInUse) {}
surfaceInUse = true; surfaceInUse = true;
d3d9dev->StretchRect(d3d9surface, &srcRect, backbuffer, &dstRect, video_filter_method == 0 ? D3DTEXF_POINT : D3DTEXF_LINEAR); d3d9dev->StretchRect(d3d9surface, &srcRect, backbuffer, &dstRect, video_filter_method == 0 ? D3DTEXF_POINT : D3DTEXF_LINEAR);

2
src/qt/qt_platform.cpp
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