Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Nexus][PVR] Timer settings dialog: Set certain settings to default on change of timer type. #23385

Merged
merged 1 commit into from Jun 10, 2023

Conversation

ksooo
Copy link
Member

@ksooo ksooo commented Jun 10, 2023

Backport of #23384

@emveepee fyi

@phunkyfish whenever you find some time for the code review

@ksooo ksooo added Type: Fix non-breaking change which fixes an issue Component: PVR Type: Backport v20 Nexus labels Jun 10, 2023
@ksooo ksooo added this to the Nexus 20.2 milestone Jun 10, 2023
@ksooo ksooo requested a review from phunkyfish June 10, 2023 19:43
@ksooo
Copy link
Member Author

ksooo commented Jun 10, 2023

Jenkins errors are unrelated.

00:21:33.831 C:\jenkins-workspace\workspace\WIN-UWP-32\kodi-build.win32-uwp\build\cores\RetroPlayer\messages\savestate_generated.h(12,46): error C2338: static_assert failed: 'Non-compatible flatbuffers version included' (compiling source file C:\jenkins-workspace\workspace\WIN-UWP-32\xbmc\cores\RetroPlayer\savestates\SavestateFlatBuffer.cpp) [C:\jenkins-workspace\workspace\WIN-UWP-32\kodi-build.win32-uwp\libkodi.vcxproj]
00:21:34.001 C:\jenkins-workspace\workspace\WIN-UWP-32\kodi-build.win32-uwp\build\cores\RetroPlayer\messages\video_generated.h(12,46): error C2338: static_assert failed: 'Non-compatible flatbuffers version included' (compiling source file C:\jenkins-workspace\workspace\WIN-UWP-32\xbmc\cores\RetroPlayer\savestates\SavestateFlatBuffer.cpp) [C:\jenkins-workspace\workspace\WIN-UWP-32\kodi-build.win32-uwp\libkodi.vcxproj]
00:21:34.095 C:\jenkins-workspace\workspace\WIN-UWP-32\kodi-build.win32-uwp\build\cores\RetroPlayer\messages\savestate_generated.h(151,12): error C2672: 'flatbuffers::Table::VerifyField': no matching overloaded function found (compiling source file C:\jenkins-workspace\workspace\WIN-UWP-32\xbmc\cores\RetroPlayer\savestates\SavestateFlatBuffer.cpp) [C:\jenkins-workspace\workspace\WIN-UWP-32\kodi-build.win32-uwp\libkodi.vcxproj]

@ksooo ksooo merged commit 5eb7778 into xbmc:Nexus Jun 10, 2023
1 of 2 checks passed
@ksooo ksooo deleted the pvr-timer-settings-type-change-fix-nexus branch June 10, 2023 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: PVR Type: Backport Type: Fix non-breaking change which fixes an issue v20 Nexus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants