deckmanager crashed on bad files

This commit is contained in:
Maxmtg
2011-09-26 22:51:37 +00:00
parent 5c255e23ed
commit aa2b87d265

View File

@@ -373,7 +373,7 @@ public class DeckManager {
//readDeck comments //readDeck comments
String comment = null; String comment = null;
while ((line = iterator.next()) != null && !line.equals("[general]")) { while (iterator.hasNext() && (line = iterator.next()) != null && !line.equals("[general]")) {
if (comment == null) { if (comment == null) {
comment = line; comment = line;
} else { } else {
@@ -382,7 +382,8 @@ public class DeckManager {
} }
//readDeck deck type //readDeck deck type
GameType deckType = GameType.smartValueOf(iterator.next());
GameType deckType = iterator.hasNext() ? GameType.smartValueOf(iterator.next()) : GameType.Constructed;
d.setName(name); d.setName(name);
d.setComment(comment); d.setComment(comment);