all repos — mgba @ defaeb0d80ebbdfbd3f0135cb36dc56dc35cdab5

mGBA Game Boy Advance Emulator

mVL: Fix injecting accidentally draining non-injection buffer
Vicki Pfau vi@endrift.com
Sat, 08 Aug 2020 18:14:28 -0700
commit

defaeb0d80ebbdfbd3f0135cb36dc56dc35cdab5

parent

e902a253946efa4abcd2c8c930a7733998c5f337

27 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -37,6 +37,7 @@ - Qt: Fix static compilation in MinGW (fixes mgba.io/i/1769)
  - Qt: Fix a race condition in the frame inspector
  - Qt: Add dummy English translation file (fixes mgba.io/i/1469)
  - mGUI: Fix closing down a game if an exit is signalled
+ - mVL: Fix injecting accidentally draining non-injection buffer
  - SM83: Simplify register pair access on big endian
  - VFS: Fix directory node listing on some filesystems
 Misc:
M src/feature/video-logger.c → src/feature/video-logger.c 
@@ -1000,7 +1000,7 @@ }
 		data = (uint8_t*) data + size;
 		length -= size;
 	}
-	if (!_fillBuffer(context, channelId, BUFFER_BASE_SIZE)) {
+	if (channel->injecting || !_fillBuffer(context, channelId, BUFFER_BASE_SIZE)) {
 		return size;
 	}
 	size += CircleBufferRead(buffer, data, length);