Merge branch '2nd_generation'

[coroid/NicoBrowser.git] / src / nicobrowser / main / Main.java

diff --git a/src/nicobrowser/main/Main.java b/src/nicobrowser/main/Main.java
index a64f317..ac58805 100644 (file)
--- a/src/nicobrowser/main/Main.java
+++ b/src/nicobrowser/main/Main.java
@@ -208,7 +208,10 @@ public class Main {
                     GetFlvResult result = instance.getFlvFile(vi, saveDir, np, c.getStatus(), config.needLowFile(),
                             ProgressListener.EMPTY_LISTENER);
 
-                    c.setFileName(FilenameUtils.getBaseName(result.getFile().toString()));
+                    final File f = result.getFile();
+                    if(f != null){
+                        c.setFileName(FilenameUtils.getBaseName(f.toString()));
+                    }
                     c.setAuthor(result.getAuthor());
                     Status status = result.getStatus();
                     c.setStatus(status);