From d4d24ab11438ded3e3b861647509a599419255b6 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Fri, 15 Apr 2022 18:26:55 -0700
Subject: [PATCH] Fix crash in cutscene_enter_painting

---
 src/game/camera.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/game/camera.c b/src/game/camera.c
index 82f59fd42..5f29603c0 100644
--- a/src/game/camera.c
+++ b/src/game/camera.c
@@ -10174,10 +10174,12 @@ BAD_RETURN(s32) cutscene_enter_painting(struct Camera *c) {
 
         find_floor(sMarioCamState->pos[0], sMarioCamState->pos[1] + 50.f, sMarioCamState->pos[2], &floor);
 
-        if ((floor->type < SURFACE_PAINTING_WOBBLE_A6) || (floor->type > SURFACE_PAINTING_WARP_F9)) {
-            c->cutscene = 0;
-            gCutsceneTimer = CUTSCENE_STOP;
-            sStatusFlags |= CAM_FLAG_SMOOTH_MOVEMENT;
+        if (floor != NULL) {
+            if ((floor->type < SURFACE_PAINTING_WOBBLE_A6) || (floor->type > SURFACE_PAINTING_WARP_F9)) {
+                c->cutscene = 0;
+                gCutsceneTimer = CUTSCENE_STOP;
+                sStatusFlags |= CAM_FLAG_SMOOTH_MOVEMENT;
+            }
         }
     }
     c->mode = CAMERA_MODE_CLOSE;