From 2efab7ece362abf8404aca20e4ebc9e5110716f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?= Date: Fri, 29 Oct 2010 21:33:50 +0000 Subject: [PATCH] update svn properties Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3653 --- src/gui/sdl_mapper.cpp | 4 ++-- src/hardware/sblaster.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp index ea541796..54ab6da8 100644 --- a/src/gui/sdl_mapper.cpp +++ b/src/gui/sdl_mapper.cpp @@ -1584,8 +1584,8 @@ public: case MK_printscreen: key=SDLK_PRINT; break; - case MK_home: - key=SDLK_HOME; + case MK_home: + key=SDLK_HOME; break; } sprintf(buf,"%s \"key %d%s%s%s\"", diff --git a/src/hardware/sblaster.cpp b/src/hardware/sblaster.cpp index 8dbd4799..63b7c46a 100644 --- a/src/hardware/sblaster.cpp +++ b/src/hardware/sblaster.cpp @@ -1345,7 +1345,7 @@ static Bit8u CTMIXER_Read(void) { return ret; case 0x82: /* IRQ Status */ return (sb.irq.pending_8bit ? 0x1 : 0) | - (sb.irq.pending_16bit ? 0x2 : 0) | + (sb.irq.pending_16bit ? 0x2 : 0) | ((sb.type == SBT_16) ? 0x20 : 0); default: if ( ((sb.type == SBT_PRO1 || sb.type == SBT_PRO2) && sb.mixer.index==0x0c) || /* Input control on SBPro */