Skip initialization of file watcher for exception watcher when it's d…

…isabled - Addresses #50
MerlinVR · Jul 13, 2020 · 3d37c8d · 3d37c8d
1 parent 81c4355
commit 3d37c8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Assets/UdonSharp/Editor/UdonSharpRuntimeExceptionWatcher.cs b/Assets/UdonSharp/Editor/UdonSharpRuntimeExceptionWatcher.cs
@@ -35,11 +35,14 @@ static bool InitializeScriptLookup()
 
             if (EditorApplication.isCompiling || EditorApplication.isUpdating)
                 return false;
-
-            AssemblyReloadEvents.beforeAssemblyReload += CleanupLogWatcher;
 
             UdonSharpSettings udonSharpSettings = UdonSharpSettings.GetSettings();
 
+            if (udonSharpSettings == null || !udonSharpSettings.listenForVRCExceptions)
+                return false;
+
+            AssemblyReloadEvents.beforeAssemblyReload += CleanupLogWatcher;
+
             if (logDirectoryWatcher == null)
             {
                 // Now setup the filesystem watcher

diff --git a/Assets/UdonSharp/version.txt b/Assets/UdonSharp/version.txt
@@ -1 +1 @@
-v0.17.1
+v0.17.2