aboutsummaryrefslogtreecommitdiff
path: root/src/github
diff options
context:
space:
mode:
authorScott Moak <scott.moak@mybrainoncode.com>2014-01-05 20:57:01 -0800
committerScott Moak <scott.moak@mybrainoncode.com>2014-01-05 20:57:01 -0800
commite6ae433f746a30b38312a0068566dbe290dc2a16 (patch)
tree02e616b0a18906ad9fcb8f27a432577420103c8a /src/github
parentf91d7473ce45f661ff2599841cf4464dd4973316 (diff)
downloaddsub-e6ae433f746a30b38312a0068566dbe290dc2a16.tar.gz
dsub-e6ae433f746a30b38312a0068566dbe290dc2a16.tar.bz2
dsub-e6ae433f746a30b38312a0068566dbe290dc2a16.zip
Fix NPE in download of file when song has no transcode suffix
Diffstat (limited to 'src/github')
-rw-r--r--src/github/daneren2005/dsub/service/DownloadFile.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadFile.java b/src/github/daneren2005/dsub/service/DownloadFile.java
index c3758b01..f0b3d802 100644
--- a/src/github/daneren2005/dsub/service/DownloadFile.java
+++ b/src/github/daneren2005/dsub/service/DownloadFile.java
@@ -95,13 +95,14 @@ public class DownloadFile {
}
private int getActualBitrate() {
int br = song.isVideo() ? Util.getMaxVideoBitrate(context) : Util.getMaxBitrate(context);
- if(br == 0 && "mp3".equals(song.getTranscodedSuffix().toLowerCase())) {
- if(song.getBitRate() != null) {
- br = Math.min(320, song.getBitRate());
- } else {
- br = 320;
- }
- }
+ if (br == 0 && song.getTranscodedSuffix() != null &&
+ "mp3".equals(song.getTranscodedSuffix().toLowerCase()) &&
+ song.getBitRate() != null) {
+ br = Math.min(320, song.getBitRate());
+ } else {
+ br = 320;
+ }
+
return br;
}