diff options
| author | 2018-01-15 12:56:16 -0500 | |
|---|---|---|
| committer | 2018-01-15 12:56:16 -0500 | |
| commit | 054d3e5fc3bdfffa35166b4554b79e110a50b69a (patch) | |
| tree | 72013db427160f5f250d101e6f6a46ef54f3a178 /externals/microprofile/microprofileui.h | |
| parent | Merge pull request #16 from shinyquagsire23/hid-sharedmem-impl-start (diff) | |
| parent | Clanggit rebase -i fixes (diff) | |
| download | yuzu-054d3e5fc3bdfffa35166b4554b79e110a50b69a.tar.gz yuzu-054d3e5fc3bdfffa35166b4554b79e110a50b69a.tar.xz yuzu-054d3e5fc3bdfffa35166b4554b79e110a50b69a.zip | |
Merge pull request #20 from Andrix44/fixes
Various fixes
Diffstat (limited to 'externals/microprofile/microprofileui.h')
| -rw-r--r-- | externals/microprofile/microprofileui.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/externals/microprofile/microprofileui.h b/externals/microprofile/microprofileui.h index 7670fec5d..ddaebe55b 100644 --- a/externals/microprofile/microprofileui.h +++ b/externals/microprofile/microprofileui.h | |||
| @@ -1991,7 +1991,7 @@ const char* MicroProfileUIMenuGroups(int nIndex, bool* bSelected) | |||
| 1991 | else | 1991 | else |
| 1992 | { | 1992 | { |
| 1993 | nIndex = nIndex-1; | 1993 | nIndex = nIndex-1; |
| 1994 | if(nIndex < UI.GroupMenuCount) | 1994 | if(static_cast<uint32_t>(nIndex) < UI.GroupMenuCount) |
| 1995 | { | 1995 | { |
| 1996 | MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex]; | 1996 | MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex]; |
| 1997 | static char buffer[MICROPROFILE_NAME_MAX_LEN+32]; | 1997 | static char buffer[MICROPROFILE_NAME_MAX_LEN+32]; |
| @@ -2134,7 +2134,7 @@ const char* MicroProfileUIMenuCustom(int nIndex, bool* bSelected) | |||
| 2134 | case 1: return "--"; | 2134 | case 1: return "--"; |
| 2135 | default: | 2135 | default: |
| 2136 | nIndex -= 2; | 2136 | nIndex -= 2; |
| 2137 | if(nIndex < UI.nCustomCount) | 2137 | if(static_cast<uint32_t>(nIndex) < UI.nCustomCount) |
| 2138 | { | 2138 | { |
| 2139 | return UI.Custom[nIndex].pName; | 2139 | return UI.Custom[nIndex].pName; |
| 2140 | } | 2140 | } |
| @@ -2184,7 +2184,7 @@ void MicroProfileUIClickGroups(int nIndex) | |||
| 2184 | else | 2184 | else |
| 2185 | { | 2185 | { |
| 2186 | nIndex -= 1; | 2186 | nIndex -= 1; |
| 2187 | if(nIndex < UI.GroupMenuCount) | 2187 | if(static_cast<uint32_t>(nIndex) < UI.GroupMenuCount) |
| 2188 | { | 2188 | { |
| 2189 | MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex]; | 2189 | MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex]; |
| 2190 | if(Item.nIsCategory) | 2190 | if(Item.nIsCategory) |