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

Merge branch 'fixCrash' into 'master'

Browse Source 
Fix desktop GUI crash

Closes #950

See merge request core-developers/forge!3625
This commit is contained in:
Sol
2021-01-23 15:14:59 +00:00
parent 5d3e1f5d12 87542521f1
commit a2cdc280c1
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -28,6 +28,7 @@ import forge.util.Lang;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.NameGenerator; import forge.util.NameGenerator;
import forge.util.gui.SOptionPane; import forge.util.gui.SOptionPane;
import forge.view.FView;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import javax.swing.*; import javax.swing.*;
@@ -517,6 +518,11 @@ public class VLobby implements ILobbyView {
} }
private void selectMainDeck(final int playerIndex) { private void selectMainDeck(final int playerIndex) {
// not fully done loading yet, avoid any changes
if (FView.SINGLETON_INSTANCE.getSplash() != null) {
return;
}
if (hasVariant(GameType.Commander) || hasVariant(GameType.Oathbreaker) || hasVariant(GameType.TinyLeaders) || hasVariant(GameType.Brawl)) { if (hasVariant(GameType.Commander) || hasVariant(GameType.Oathbreaker) || hasVariant(GameType.TinyLeaders) || hasVariant(GameType.Brawl)) {
// These game types use specific deck panel // These game types use specific deck panel
return; return;
@@ -524,6 +530,10 @@ public class VLobby implements ILobbyView {
final FDeckChooser mainChooser = getDeckChooser(playerIndex); final FDeckChooser mainChooser = getDeckChooser(playerIndex);
final DeckType type = mainChooser.getSelectedDeckType(); final DeckType type = mainChooser.getSelectedDeckType();
final Deck deck = mainChooser.getDeck(); final Deck deck = mainChooser.getDeck();
// something went wrong, clear selection to prevent error loop
if (deck == null) {
mainChooser.getLstDecks().setSelectedIndex(0);
}
final Collection<DeckProxy> selectedDecks = mainChooser.getLstDecks().getSelectedItems(); final Collection<DeckProxy> selectedDecks = mainChooser.getLstDecks().getSelectedItems();
if (playerIndex < activePlayersNum && lobby.mayEdit(playerIndex)) { if (playerIndex < activePlayersNum && lobby.mayEdit(playerIndex)) {
final String text = type.toString() + ": " + Lang.joinHomogenous(selectedDecks, DeckProxy.FN_GET_NAME); final String text = type.toString() + ": " + Lang.joinHomogenous(selectedDecks, DeckProxy.FN_GET_NAME);