[Scummvm-git-logs] scummvm branch-2-5 -> 860da9b46ae2dfb5b17de741dabbe947f4837345

criezy criezy at scummvm.org
Thu Oct 14 20:02:26 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
860da9b46a SDL: Fix exception on macOS 10.4/10.5


Commit: 860da9b46ae2dfb5b17de741dabbe947f4837345
    https://github.com/scummvm/scummvm/commit/860da9b46ae2dfb5b17de741dabbe947f4837345
Author: Evan Miller (emmiller at gmail.com)
Date: 2021-10-14T21:02:13+01:00

Commit Message:
SDL: Fix exception on macOS 10.4/10.5

The getBytes:...:remainingRange: API was introduced in 10.6.

Changed paths:
    backends/platform/sdl/macosx/macosx_wrapper.mm


diff --git a/backends/platform/sdl/macosx/macosx_wrapper.mm b/backends/platform/sdl/macosx/macosx_wrapper.mm
index baed506488..e017d4e4fc 100644
--- a/backends/platform/sdl/macosx/macosx_wrapper.mm
+++ b/backends/platform/sdl/macosx/macosx_wrapper.mm
@@ -60,7 +60,7 @@ Common::U32String getTextFromClipboardMacOSX() {
 
 	NSPasteboard *pb = [NSPasteboard generalPasteboard];
 	NSString *str = [pb  stringForType:NSPasteboardTypeString];
-	if (str == nil)
+	if (![str respondsToSelector:@selector(getBytes:maxLength:usedLength:encoding:options:range:remainingRange:)])
 		return Common::U32String();
 
 	// If translations are supported, use the current TranslationManager charset and otherwise




More information about the Scummvm-git-logs mailing list