[Issue #156] Fix null reference when context menu is not defined.

comixed · Mar 25, 2020 · 5626121 · 5626121
1 parent d55943b
commit 5626121
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/comixed-frontend/src/app/library/components/comic-list/comic-list.component.ts b/comixed-frontend/src/app/library/components/comic-list/comic-list.component.ts
@@ -111,9 +111,6 @@ export class ComicListComponent implements OnInit, OnDestroy {
     private router: Router
   ) {
     this.addContextMenuItems();
-  }
-
-  ngOnInit() {
     this.contextMenuItemsSubscription = this.contextMenuAdaptor.items$.subscribe(
       items => {
         this.contextMenuItems = generateContextMenuItems(
@@ -124,7 +121,7 @@ export class ComicListComponent implements OnInit, OnDestroy {
     );
     this.mouseEventSubscription = this.contextMenuAdaptor.mouseEvent$.subscribe(
       event => {
-        if (!!event) {
+        if (!!event && !!this.contextMenu) {
           this.contextMenu.show(event);
         }
       }
@@ -167,6 +164,8 @@ export class ComicListComponent implements OnInit, OnDestroy {
     this.readingListAdaptor.get_reading_lists();
   }
 
+  ngOnInit() {}
+
   ngOnDestroy() {
     this.contextMenuItemsSubscription.unsubscribe();
     this.mouseEventSubscription.unsubscribe();