mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Code Issues Releases Wiki Activity

Fix #14468: Cannot close Options window on Android

Browse Source 
Issue was caused by the WIDX_ALWAYS_NATIVE_LOADSAVE flag not being enabled/disabled correctly.
This commit is contained in:
Dan Silk
2021-05-16 07:13:50 +09:30
committed by GitHub
parent 0123a3d141
commit 05977e6d14
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -14,6 +14,7 @@
- Fix: [#14315] Crash when trying to rename Air Powered Vertical Coaster in Korean.
- Fix: [#14330] join_server uses default_port from config.
- Fix: [#14449] Surface smoothing at extra zoom levels not working.
- Fix: [#14468] Cannot close Options window on Android.
- Fix: [#14493] [Plugin] isHidden only works for tile elements up to the first element with a base height of over 32.
- Fix: [#14587] Confusing message when joining server with mismatched network version.
- Fix: [#14604] American-style Steam Trains are not imported correctly from RCT1 saves.

4
src/openrct2-ui/windows/Options.cpp
View File

@@ -583,8 +583,8 @@ static void window_options_common_invalidate_before(rct_window* w)
auto hasFilePicker = OpenRCT2::GetContext()->GetUiContext()->HasFilePicker();
if (!hasFilePicker)
{
w->enabled_widgets &= ~WIDX_ALWAYS_NATIVE_LOADSAVE;
w->disabled_widgets |= WIDX_ALWAYS_NATIVE_LOADSAVE;
w->enabled_widgets &= ~ (1ULL << WIDX_ALWAYS_NATIVE_LOADSAVE);
w->disabled_widgets |= (1ULL << WIDX_ALWAYS_NATIVE_LOADSAVE);
w->widgets[WIDX_ALWAYS_NATIVE_LOADSAVE].type = WindowWidgetType::Empty;
}
}