From acdb6b221050be4795b9942db174401166f4d4c9 Mon Sep 17 00:00:00 2001 From: SimoneN64 Date: Sun, 18 Aug 2024 01:07:48 +0200 Subject: [PATCH] Fix TAS movie crash --- src/backend/core/mmio/PIF/MupenMovie.cpp | 2 +- src/utils/log.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/core/mmio/PIF/MupenMovie.cpp b/src/backend/core/mmio/PIF/MupenMovie.cpp index 2ce74620..b6fd9237 100644 --- a/src/backend/core/mmio/PIF/MupenMovie.cpp +++ b/src/backend/core/mmio/PIF/MupenMovie.cpp @@ -35,7 +35,7 @@ bool MupenMovie::Load(const fs::path &path) { return false; } - memcpy(&loadedTasMovieHeader, loadedTasMovie.data(), loadedTasMovie.size()); + memcpy(&loadedTasMovieHeader, loadedTasMovie.data(), sizeof(TASMovieHeader)); if (loadedTasMovieHeader.signature[0] != 0x4D || loadedTasMovieHeader.signature[1] != 0x36 || loadedTasMovieHeader.signature[2] != 0x34 || loadedTasMovieHeader.signature[3] != 0x1A) { Util::error("Failed to load movie: incorrect signature. Are you sure this is a valid movie?"); diff --git a/src/utils/log.hpp b/src/utils/log.hpp index 8ad7e7d2..f87f3c19 100644 --- a/src/utils/log.hpp +++ b/src/utils/log.hpp @@ -9,13 +9,13 @@ namespace Util { enum LogLevel : u8 { - Trace, Debug, Info, Warn, Error, Always + Trace, Debug, Warn, Info, Error, Always }; #ifndef NDEBUG static constexpr auto globalLogLevel = Debug; #else -static constexpr auto globalLogLevel = Error; +static constexpr auto globalLogLevel = Info; #endif template