mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Catch NPE from broken Region earlier to prevent game freeze, BR#2885

This commit is contained in:
Sebastian Zhorel 2015-08-02 14:31:58 +02:00
parent 5ca144f438
commit 0129a9065d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/sf/freecol/client/gui/MapViewer.java
View File

@ -47,6 +47,7 @@ import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.ImageIcon;
@ -1904,7 +1905,11 @@ public final class MapViewer {
&& tile.getRegion().getName() == null) {
text = tile.getRegion().getSuffix();
} else {
text = Messages.message(tile.getRegion().getLabel());
try {
text = Messages.message(tile.getRegion().getLabel());
} catch(NullPointerException e) {
logger.log(Level.WARNING, "Uninitialized Region"/*, e*/);
}
}
}
displayTerritorialBorders(g, tile, BorderType.REGION, true);