Merge branch 'master' into memberpointer

4 files changed, 12 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b6f013..44a17b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.3.2]
+
+### Fix
+
+- Cannot read property 'text' of undefined (#79)
+
 ## [0.3.1]
 
 ### Fix
diff --git a/package.json b/package.json
index 335296c..33b7925 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "doxdocgen",
   "displayName": "Doxygen Documentation Generator",
   "description": "Let me generate Doxygen documentation from your source code for you.",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "publisher": "cschlosser",
   "engines": {
     "vscode": "^1.16.0"
diff --git a/src/CodeParserController.ts b/src/CodeParserController.ts
index 04928e8..8be7034 100644
--- a/src/CodeParserController.ts
+++ b/src/CodeParserController.ts
@@ -57,7 +57,8 @@ export default class CodeParserController {
      ***************************************************************************/
 
     private check(activeEditor: TextEditor, event: TextDocumentContentChangeEvent): boolean {
-        if (activeEditor == null || event.text == null) {
+        if (activeEditor === undefined || activeEditor == null ||
+            event === undefined || event.text == null) {
             return false;
         }
         const activeSelection: Position = activeEditor.selection.active;
diff --git a/src/extension.ts b/src/extension.ts
index 73be843..5ac1b01 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -12,8 +12,8 @@ enum ConfigChangedNotificationOptions {
 }
 
 enum Version {
-    CURRENT = "0.3.1",
-    PREVIOUS = "0.3.0",
+    CURRENT = "0.3.2",
+    PREVIOUS = "0.3.1",
     KEY = "doxdocgen_version",
 }
 
@@ -31,6 +31,7 @@ export function activate(context: vscode.ExtensionContext) {
         context.globalState.update(Version.KEY, Version.CURRENT);
     } else if (version !== Version.CURRENT) {
         change = true;
+        context.globalState.update(Version.KEY, Version.CURRENT);
     }
 
     let notificationHideThenable: Thenable<string>;