joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix output switch

Browse Source
This commit is contained in:
Wengier 2020-11-28 16:47:41 -05:00
parent eade5fe0d4
commit 1a2d3d9511
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hardware/hardware.cpp
View File

@ -643,9 +643,6 @@ void ttf_switch_off() {
void ttf_switch_on() {
if (ttfswitch && !(CaptureState & CAPTURE_IMAGE) && !(CaptureState & CAPTURE_VIDEO)) {
#if C_DIRECT3D
if (Direct3D_using()) change_output(0);
#endif
change_output(10);
SetVal("sdl", "output", "ttf");
void OutputSettingMenuUpdate(void);

6
src/ints/int10_modes.cpp
View File

@ -1119,7 +1119,7 @@ bool INT10_SetVideoMode_OTHER(uint16_t mode,bool clearmem) {
#if defined(USE_TTF)
extern bool resetreq;
bool GFX_IsFullscreen(void), Direct3D_using(void);
void ttf_reset(void), resetFontSize(), OUTPUT_TTF_Select(int fsize), KEYBOARD_Clear(), GFX_SwitchFullscreenNoReset(void);
void ttf_reset(void), resetFontSize(), OUTPUT_TTF_Select(int fsize), RENDER_Reset(void), KEYBOARD_Clear(), GFX_SwitchFullscreenNoReset(void);
#endif
bool unmask_irq0_on_int10_setmode = true;
@ -2013,9 +2013,6 @@ dac_text16:
if (ttf.inUse)
ttf_reset();
else if (switch_output_from_ttf) {
#if C_DIRECT3D
if (Direct3D_using()) change_output(0);
#endif
change_output(10);
SetVal("sdl", "output", "ttf");
void OutputSettingMenuUpdate(void);
@ -2064,6 +2061,7 @@ dac_text16:
switch_output_from_ttf = true;
//if (GFX_IsFullscreen()) GFX_SwitchFullscreenNoReset();
mainMenu.get_item("output_ttf").enable(false).refresh_item(mainMenu);
RENDER_Reset();
#endif
}
// Enable screen memory access