check for null in updateNowPlayingFile, oops.

fixes #35 and #33
Hyphen-ated · Jul 5, 2015 · e337bbb · e337bbb
1 parent 43e340a
commit e337bbb
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/java/hyphenated/djbot/DjService.java b/src/main/java/hyphenated/djbot/DjService.java
@@ -590,10 +590,16 @@ private void updatePlayedSongsFile() throws IOException {
 
     //go write to the filesystem so the user can overlay this text file on their stream if they want
     private void updateNowPlayingFile(SongEntry currentSong) {
-        String nowPlaying = conf.getNowPlayingPattern();
-        nowPlaying = nowPlaying.replace("%title%", currentSong.getTitle());
-        nowPlaying = nowPlaying.replace("%user%", currentSong.getUser());
-        nowPlaying = nowPlaying.replace("%length%", currentSong.buildDurationStr());
+        String nowPlaying;
+        if(currentSong != null) {
+            nowPlaying = conf.getNowPlayingPattern();
+            nowPlaying = nowPlaying.replace("%title%", currentSong.getTitle());
+            nowPlaying = nowPlaying.replace("%user%", currentSong.getUser());
+            nowPlaying = nowPlaying.replace("%length%", currentSong.buildDurationStr());
+        } else {
+            nowPlaying = "";
+        }
+
         try {
             FileUtils.writeStringToFile(new File(nowPlayingFilePath), nowPlaying, false);
         } catch (IOException e) {