Fix contentManager undefined when builtin manager used (#3710)

* Fix for contentManager undefined for builtin manager

* Clean up code some more
This commit is contained in:
Chris LaFreniere
2019-01-11 10:36:36 -08:00
committed by GitHub
parent 71c1ed6c49
commit d0acb51fd7

View File

@@ -76,7 +76,11 @@ export class NotebookModel extends Disposable implements INotebookModel {
} }
public get notebookManagers(): INotebookManager[] { public get notebookManagers(): INotebookManager[] {
return this.notebookOptions.notebookManagers.filter(manager => manager.providerId !== DEFAULT_NOTEBOOK_PROVIDER); let notebookManagers = this.notebookOptions.notebookManagers.filter(manager => manager.providerId !== DEFAULT_NOTEBOOK_PROVIDER);
if (!notebookManagers.length) {
return this.notebookOptions.notebookManagers;
}
return notebookManagers;
} }
public get notebookManager(): INotebookManager { public get notebookManager(): INotebookManager {
@@ -424,6 +428,9 @@ export class NotebookModel extends Disposable implements INotebookModel {
await this.loadActiveContexts(e); await this.loadActiveContexts(e);
}); });
}); });
if (!this.notebookManager) {
return;
}
try { try {
let sessionManager = this.notebookManager.sessionManager; let sessionManager = this.notebookManager.sessionManager;
if (sessionManager) { if (sessionManager) {