Merge commit '8e4e41fa135641b23f68e205832e0696951c5f63'

[simantics/platform.git] / bundles / org.simantics.fileimport / src / org / simantics / fileimport / dropins / FileImportDropins.java

diff --git a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java
index 21a9f9ab0152fd5fab5d5a6d84d50e553d2a047f..5942c5deb299956e871f034c86efe78bcd07f358 100644 (file)
--- a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java
+++ b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java
@@ -59,6 +59,8 @@ public class FileImportDropins {
      * Stop watching the dropins folder\r
      */\r
     public static void unwatchDropinsFolder() {\r
+        if (watcher == null)\r
+            return;\r
         watcher.stop();\r
         try {\r
             watcherThread.join(500);\r