Merge pull request #13744 from hrydgard/unknownbrackets-scrollpos

Avoid potential crash without storage permissions
This commit is contained in:
Henrik Rydgård 2020-12-06 19:53:33 +01:00 committed by GitHub
commit e1387a9bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1050,6 +1050,7 @@ void MainScreen::CreateViews() {
leftColumn->Add(new Spacer(new LinearLayoutParams(0.1f)));
}
} else {
scrollAllGames_ = nullptr;
if (!showRecent) {
leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 1.0f));
// Just so it's destroyed on recreate.
@ -1203,7 +1204,9 @@ void MainScreen::update() {
RecreateViews();
lastVertical_ = vertical;
}
g_Config.fGameListScrollPosition = scrollAllGames_->GetScrollPosition();
if (scrollAllGames_) {
g_Config.fGameListScrollPosition = scrollAllGames_->GetScrollPosition();
}
}
bool MainScreen::UseVerticalLayout() const {