external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
[Mobile] Fix selected deck on activate

See merge request core-developers/forge!4143
This commit is contained in:
Anthony Calosa
2021-03-08 03:23:43 +00:00
parent f97c3e06ad 0d35f4806e
commit ac3ff9e966
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -231,10 +231,11 @@ public class FDeckChooser extends FScreen {
@Override @Override
public void onActivate() { public void onActivate() {
//somehow a loaded deck state from startup don't refresh accordingly for imageview so refresh it on first activation String aiSelected = "";
if(firstactivation) { if(isAi() && firstactivation) {
needRefreshOnActivate = true; needRefreshOnActivate = true;
firstactivation = false; firstactivation = false;
aiSelected = lstDecks.getSelectedItem().getDeck().toString();
} }
if (needRefreshOnActivate) { if (needRefreshOnActivate) {
needRefreshOnActivate = false; needRefreshOnActivate = false;
@@ -290,6 +291,9 @@ public class FDeckChooser extends FScreen {
} }
break; break;
default: default:
if (isAi())
lstDecks.setSelectedString(aiSelected);
else
lstDecks.setSelectedString(DeckPreferences.getCurrentDeck()); lstDecks.setSelectedString(DeckPreferences.getCurrentDeck());
break; break;
} }