X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.fileimport%2Fsrc%2Forg%2Fsimantics%2Ffileimport%2Fdropins%2FFileImportDropins.java;h=5942c5deb299956e871f034c86efe78bcd07f358;hb=5134e3d53a652adc5b1936c17fe3ec6fb8ef433e;hp=21a9f9ab0152fd5fab5d5a6d84d50e553d2a047f;hpb=749a1ea2c0a66ae41aad617d1fd81b61cbdb7685;p=simantics%2Fplatform.git

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 21a9f9ab0..5942c5deb 100644
--- 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
      */
     public static void unwatchDropinsFolder() {
+        if (watcher == null)
+            return;
         watcher.stop();
         try {
             watcherThread.join(500);