From da863078e924b3837acf878d06f1a144ff3201bd Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sun, 6 Nov 2022 15:55:39 -0800
Subject: [PATCH] viewer: add missing null check for flags

---
 src/components/Viewer.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue
index 464b16a8..11415577 100644
--- a/src/components/Viewer.vue
+++ b/src/components/Viewer.vue
@@ -254,7 +254,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
     // Video support
     this.photoswipe.on("contentLoad", (e) => {
       const { content, isLazy } = e;
-      if (content.data.photo.flag & this.c.FLAG_IS_VIDEO) {
+      if ((content.data?.photo?.flag || 0) & this.c.FLAG_IS_VIDEO) {
         e.preventDefault();
 
         content.type = "video";
@@ -295,7 +295,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
     // Play video on open slide
     this.photoswipe.on("slideActivate", (e) => {
       const { slide } = e;
-      if (slide.data.photo.flag & this.c.FLAG_IS_VIDEO) {
+      if ((slide.data?.photo?.flag || 0) & this.c.FLAG_IS_VIDEO) {
         setTimeout(() => {
           slide.content.element.querySelector("video")?.play();
         }, 500);
@@ -305,7 +305,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
     // Pause video on close slide
     this.photoswipe.on("slideDeactivate", (e) => {
       const { slide } = e;
-      if (slide.data.photo.flag & this.c.FLAG_IS_VIDEO) {
+      if ((slide.data?.photo?.flag || 0) & this.c.FLAG_IS_VIDEO) {
         slide.content.element.querySelector("video")?.pause();
       }
     });
@@ -428,7 +428,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
     // Scroll to keep the thumbnail in view
     this.photoswipe.on("slideActivate", (e) => {
-      const thumb = this.thumbElem(e.slide.data.photo);
+      const thumb = this.thumbElem(e.slide.data?.photo);
       if (thumb) {
         const rect = thumb.getBoundingClientRect();
         if (rect.top < 0 || rect.bottom > window.innerHeight) {