From: Jussi Koskela <jussi.koskela@semantum.fi>
Date: Mon, 13 Nov 2017 07:51:08 +0000 (+0200)
Subject: Fixed NPE when disposing uninitialized SCL module editor
X-Git-Tag: v1.31.0~46
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=00a7b787f7ef8b85bfee18448fbe8e21c689b4b3;p=simantics%2Fplatform.git

Fixed NPE when disposing uninitialized SCL module editor

refs #7612

Change-Id: I1dbd37b199034caa288a95012f2cbb9b4385c00c
---

diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java
index 0e068d69b..b7ab0f170 100644
--- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java
+++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java
@@ -121,7 +121,7 @@ public class SCLModuleEditor2 extends TextEditor {
         disposed = true;
         super.dispose();
         resourceManager.dispose();
-        matcher.dispose();
+        if (matcher != null) matcher.dispose();
     }
 
     public boolean isDisposed() {