aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-08-02 10:57:50 +0200
committerChristian Schneppe <christian@pix-art.de>2016-08-11 21:34:44 +0200
commit3a73ea74182f33ca9397784cef7423ee75c51225 (patch)
treeff5e6a06e373540bdde390d465ef5c8a50d9b285 /src/main/java/de/pixart
parentca17eb5317c7d00a527b726ea068594393fdb72a (diff)
catch NPE in getVideoPreview() because getFrame sometimes returns null
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r--src/main/java/de/pixart/messenger/persistance/FileBackend.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index c9dc09ce4..bb8717551 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -443,7 +443,7 @@ public class FileBackend {
frame = metadataRetriever.getFrameAtTime(0);
metadataRetriever.release();
frame = resize(frame, size);
- } catch(IllegalArgumentException e) {
+ } catch(IllegalArgumentException | NullPointerException e) {
frame = Bitmap.createBitmap(size,size, Bitmap.Config.ARGB_8888);
frame.eraseColor(0xff000000);
}