diff options
| author | B Stack <bgstack15@gmail.com> | 2020-08-31 22:51:44 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-08-31 22:51:44 -0400 |
| commit | bef61ac53663379365601b5f369fc39122105219 (patch) | |
| tree | a240ea8ae405397c9a4ae8beaec68c68877ba316 /freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch | |
| parent | Merge branch 'connman-xdg-bump' into 'master' (diff) | |
| download | stackrpms-bef61ac53663379365601b5f369fc39122105219.tar.gz stackrpms-bef61ac53663379365601b5f369fc39122105219.tar.bz2 stackrpms-bef61ac53663379365601b5f369fc39122105219.zip | |
WIP: ffs 11.1
Does not compile yet, but this was just fixing all the fuzz.
Diffstat (limited to 'freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch')
| -rw-r--r-- | freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch index 8ca60c2..8510b4b 100644 --- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch @@ -77,7 +77,7 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/ - const int selectedPos = ctrl.GetSelection(); + const Enum currentValue = getEnumVal(mapping, ctrl); -- if (0 <= selectedPos && selectedPos < static_cast<int>(mapping.descrList.size())) +- if (0 <= selectedPos && selectedPos < std::ssize(mapping.descrList)) - { - if (const auto& [text, tooltip] = mapping.descrList[selectedPos].second; - !tooltip.empty()) @@ -92,3 +92,4 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/ } } + |