diff --git a/client/SDL/SDL3/dialogs/sdl_selectlist.cpp b/client/SDL/SDL3/dialogs/sdl_selectlist.cpp index de8849b5b..fc057c053 100644 --- a/client/SDL/SDL3/dialogs/sdl_selectlist.cpp +++ b/client/SDL/SDL3/dialogs/sdl_selectlist.cpp @@ -81,18 +81,22 @@ int SdlSelectList::run() else if (_list.empty()) CurrentActiveTextInput = 0; else - CurrentActiveTextInput = - WINPR_ASSERTING_INT_CAST(ssize_t, _list.size()) - 1; + { + auto s = _list.size(); + CurrentActiveTextInput = WINPR_ASSERTING_INT_CAST(ssize_t, s) - 1; + } break; case SDLK_DOWN: case SDLK_TAB: if ((CurrentActiveTextInput < 0) || _list.empty()) CurrentActiveTextInput = 0; else + { + auto s = _list.size(); CurrentActiveTextInput++; - CurrentActiveTextInput = - CurrentActiveTextInput % - WINPR_ASSERTING_INT_CAST(ssize_t, _list.size()); + CurrentActiveTextInput = + CurrentActiveTextInput % WINPR_ASSERTING_INT_CAST(ssize_t, s); + } break; case SDLK_RETURN: case SDLK_RETURN2: diff --git a/client/SDL/SDL3/sdl_clip.cpp b/client/SDL/SDL3/sdl_clip.cpp index 855a0875b..3b602d1b6 100644 --- a/client/SDL/SDL3/sdl_clip.cpp +++ b/client/SDL/SDL3/sdl_clip.cpp @@ -511,10 +511,10 @@ UINT sdlClip::ReceiveServerFormatList(CliprdrClientContext* context, clipboard->_current_mimetypes.push_back(s_mime_mate_copied_files); } + auto s = clipboard->_current_mimetypes.size(); SDL_Event ev = { SDL_EVENT_CLIPBOARD_UPDATE }; ev.clipboard.owner = true; - ev.clipboard.num_mime_types = - WINPR_ASSERTING_INT_CAST(Sint32, clipboard->_current_mimetypes.size()); + ev.clipboard.num_mime_types = WINPR_ASSERTING_INT_CAST(Sint32, s); ev.clipboard.mime_types = clipboard->_current_mimetypes.data(); /* TODO: Hack to identify our own updates */