From 95ec8b63fa4e8f510818bb08d50f6975c2dafa6f Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sat, 31 Dec 2016 10:41:23 +0000
Subject: [PATCH] - Do not clear out deck Vanguard avatar on subsequent calls
 to selectVanguardAvatar (fixes Default Avatar not working). - Note that
 Vanguard selection is still partly broken (for desktop Forge), it's
 impossible to select a particular avatar for each player (the avatar always
 ends up being the same), fix is welcome.

---
 .../src/main/java/forge/screens/home/VLobby.java              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
index 521e83c7104..47cbfe493c7 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
@@ -533,7 +533,7 @@ public class VLobby implements ILobbyView {
         final PlayerPanel pp = playerPanels.get(playerIndex);
         final CardDetailPanel cdp = vgdAvatarDetails.get(playerIndex);
 
-        final PaperCard vanguardAvatar;
+        PaperCard vanguardAvatar = null;
         final Deck deck = decks[playerIndex];
         if (selected instanceof PaperCard) {
             pp.setVanguardButtonText(((PaperCard) selected).getName());
@@ -548,7 +548,7 @@ public class VLobby implements ILobbyView {
             cdp.setVisible(false);
 
             if (sel == null) {
-                vanguardAvatar = null;
+                return;
             } else {
                 if (sel.contains("Use deck's default avatar") && deck != null && deck.has(DeckSection.Avatar)) {
                     vanguardAvatar = deck.get(DeckSection.Avatar).get(0);