Skip to content

Add null check for NodejsPackage.Instance. #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2015
Merged

Add null check for NodejsPackage.Instance. #410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Nodejs/Product/Nodejs/Logging/LiveLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ internal sealed class LiveLogger {
private static volatile LiveLogger _instance;
private static object _loggerLock = new object();

private NodejsDiagnosticsOptionsPage _diagnosticsOptions;
private NodejsDiagnosticsOptionsPage _diagnosticsOptions = null;

private LiveLogger() {
_diagnosticsOptions = NodejsPackage.Instance.DiagnosticsOptionsPage;
if (NodejsPackage.Instance != null) {
_diagnosticsOptions = NodejsPackage.Instance.DiagnosticsOptionsPage;
}
}

private static LiveLogger Instance {
Expand Down Expand Up @@ -68,7 +70,7 @@ public static void WriteLine(string format, params object[] args) {
private void LogMessage(string message) {
Debug.WriteLine(message);

if (_diagnosticsOptions.IsLiveDiagnosticsEnabled) {
if (_diagnosticsOptions != null && _diagnosticsOptions.IsLiveDiagnosticsEnabled) {
var pane = OutputWindowRedirector.Get(VisualStudio.Shell.ServiceProvider.GlobalProvider, LiveDiagnosticLogPaneGuid, LiveDiagnosticLogPaneName);
if (pane != null) {
pane.WriteLine(message);
Expand Down