Fix TAS movie crash

This commit is contained in:
SimoneN64
2024-08-18 01:07:48 +02:00
parent 38859deaf1
commit acdb6b2210
2 changed files with 3 additions and 3 deletions

View File

@@ -35,7 +35,7 @@ bool MupenMovie::Load(const fs::path &path) {
return false; 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) { 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?"); Util::error("Failed to load movie: incorrect signature. Are you sure this is a valid movie?");

View File

@@ -9,13 +9,13 @@
namespace Util { namespace Util {
enum LogLevel : u8 { enum LogLevel : u8 {
Trace, Debug, Info, Warn, Error, Always Trace, Debug, Warn, Info, Error, Always
}; };
#ifndef NDEBUG #ifndef NDEBUG
static constexpr auto globalLogLevel = Debug; static constexpr auto globalLogLevel = Debug;
#else #else
static constexpr auto globalLogLevel = Error; static constexpr auto globalLogLevel = Info;
#endif #endif
template <LogLevel messageType = Info, typename ...Args> template <LogLevel messageType = Info, typename ...Args>