From 470a2b5833d47c58d163adb490c2335113915614 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 10 Aug 2020 09:20:04 +1000
Subject: [PATCH] Fix sprite vtt panic (#718)

---
 pkg/api/routes_scene.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkg/api/routes_scene.go b/pkg/api/routes_scene.go
index 864a5fa23..8f2cdf9c6 100644
--- a/pkg/api/routes_scene.go
+++ b/pkg/api/routes_scene.go
@@ -306,15 +306,19 @@ func SceneCtx(next http.Handler) http.Handler {
 		sceneID, _ := strconv.Atoi(sceneIdentifierQueryParam)
 
 		var scene *models.Scene
-		var err error
 		qb := models.NewSceneQueryBuilder()
 		if sceneID == 0 {
-			scene, err = qb.FindByChecksum(sceneIdentifierQueryParam)
+			// determine checksum/os by the length of the query param
+			if len(sceneIdentifierQueryParam) == 32 {
+				scene, _ = qb.FindByChecksum(sceneIdentifierQueryParam)
+			} else {
+				scene, _ = qb.FindByOSHash(sceneIdentifierQueryParam)
+			}
 		} else {
-			scene, err = qb.Find(sceneID)
+			scene, _ = qb.Find(sceneID)
 		}
 
-		if err != nil {
+		if scene == nil {
 			http.Error(w, http.StatusText(404), 404)
 			return
 		}