temporary patch for an odd bug (scalafx/scalafx/issues/178)

RomanHargrave · Jan 25, 2015 · fc3a829 · fc3a829
1 parent 898354e
commit fc3a829
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/scala/info/hargrave/composer/ui/FXPromptInterface.scala b/src/main/scala/info/hargrave/composer/ui/FXPromptInterface.scala
@@ -105,14 +105,19 @@ final class FXPromptInterface extends PromptInterface {
             }
         }
 
-        val result = Option( multipleFiles match {
+        val dialogResponse = multipleFiles match {
             case true   =>
-                chooser.showOpenMultipleDialog(null)
+                try {
+                    chooser.showOpenMultipleDialog(null)
+                } catch {
+                    case _:NullPointerException => null // See scalafx/scalafx issue #178 on github
+                }
             case false  =>
                 val selected = chooser.showOpenDialog(null)
                 if(selected == null) Seq(selected) else null
-        } )
+        }
 
+        val result = Option(dialogResponse)
 
         /*
          * This is a (hacky?) solution that allows us to continue to prompt the user for a file selection if the caller