diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-01-05 14:08:03 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-01-05 14:08:03 +0100 |
| commit | 0aa9a96a54922cb6320c28169c27467f143c5a91 (patch) | |
| tree | 80e59780d75bd80c039628136637b49c3f6a9828 | |
| parent | a76391e857be4ca8284bd488b1a09ba1ee845669 (diff) | |
| download | cgeo-0aa9a96a54922cb6320c28169c27467f143c5a91.zip cgeo-0aa9a96a54922cb6320c28169c27467f143c5a91.tar.gz cgeo-0aa9a96a54922cb6320c28169c27467f143c5a91.tar.bz2 | |
fix #3515: crash in about
| -rw-r--r-- | main/src/cgeo/geocaching/AboutActivity.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java index a76694b..66cb027 100644 --- a/main/src/cgeo/geocaching/AboutActivity.java +++ b/main/src/cgeo/geocaching/AboutActivity.java @@ -195,11 +195,19 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> } private String getRawResourceString(final int resourceId) { - final InputStream ins = res.openRawResource(resourceId); - final Scanner scanner = new Scanner(ins, CharEncoding.UTF_8); - final String result = scanner.useDelimiter("\\A").next(); - IOUtils.closeQuietly(ins); - IOUtils.closeQuietly(scanner); + String result; + Scanner scanner = null; + try { + final InputStream ins = res.openRawResource(resourceId); + scanner = new Scanner(ins, CharEncoding.UTF_8); + result = scanner.useDelimiter("\\A").next(); + IOUtils.closeQuietly(ins); + IOUtils.closeQuietly(scanner); + } finally { + if (scanner != null) { + scanner.close(); + } + } return result; } |
