From 54d4e485399a55a313cb46565ab6b52f0be5831f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 31 Dec 2024 18:36:33 -0800 Subject: [PATCH] Get the initial clipboard state at startup --- src/video/cocoa/SDL_cocoaclipboard.m | 2 +- src/video/windows/SDL_windowsclipboard.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/video/cocoa/SDL_cocoaclipboard.m b/src/video/cocoa/SDL_cocoaclipboard.m index 2de4aa14e0..18e31a54ad 100644 --- a/src/video/cocoa/SDL_cocoaclipboard.m +++ b/src/video/cocoa/SDL_cocoaclipboard.m @@ -145,7 +145,7 @@ void Cocoa_CheckClipboardUpdate(SDL_CocoaVideoData *data) pasteboard = [NSPasteboard generalPasteboard]; count = [pasteboard changeCount]; if (count != data.clipboard_count) { - if (data.clipboard_count) { + if (count) { int nformats = 0; char **new_mime_types = GetMimeTypes(&nformats); if (new_mime_types) { diff --git a/src/video/windows/SDL_windowsclipboard.c b/src/video/windows/SDL_windowsclipboard.c index 2b6dea7a1b..3d637c73ab 100644 --- a/src/video/windows/SDL_windowsclipboard.c +++ b/src/video/windows/SDL_windowsclipboard.c @@ -426,17 +426,16 @@ static char **GetMimeTypes(int *pnformats) void WIN_CheckClipboardUpdate(struct SDL_VideoData *data) { - const DWORD seq = GetClipboardSequenceNumber(); - if (seq != data->clipboard_count) { - if (data->clipboard_count) { + DWORD count = GetClipboardSequenceNumber(); + if (count != data->clipboard_count) { + if (count) { int nformats = 0; char **new_mime_types = GetMimeTypes(&nformats); if (new_mime_types) { SDL_SendClipboardUpdate(false, new_mime_types, nformats); } } - - data->clipboard_count = seq; + data->clipboard_count = count; } }