Movie: Fix 83b9fef regressions

1. Comparing string_views does not behave the same as strncmp
   in the case where SConfig's game ID is longer than 6 chars.
2. DTMHeader::GetGameID wasn't excluding null bytes for game IDs
   shorter than 6 chars.
3. == was accidentally used instead of !=.
This commit is contained in:
JosJuice 2020-11-28 23:31:48 +01:00
parent 9b03cdf93e
commit 5642772ec4
2 changed files with 6 additions and 2 deletions

View File

@ -227,7 +227,7 @@ void Init(const BootParameters& boot)
ReadHeader();
std::thread md5thread(CheckMD5);
md5thread.detach();
if (tmpHeader.GetGameID() == SConfig::GetInstance().GetGameID())
if (strncmp(tmpHeader.gameID.data(), SConfig::GetInstance().GetGameID().c_str(), 6))
{
PanicAlertFmtT("The recorded game ({0}) is not the same as the selected game ({1})",
tmpHeader.GetGameID(), SConfig::GetInstance().GetGameID());

View File

@ -5,6 +5,7 @@
#pragma once
#include <array>
#include <cstring>
#include <functional>
#include <optional>
#include <string>
@ -64,7 +65,10 @@ static_assert(sizeof(ControllerState) == 8, "ControllerState should be 8 bytes")
#pragma pack(push, 1)
struct DTMHeader
{
std::string_view GetGameID() const { return {gameID.data(), gameID.size()}; }
std::string_view GetGameID() const
{
return {gameID.data(), strnlen(gameID.data(), gameID.size())};
}
std::array<u8, 4> filetype; // Unique Identifier (always "DTM"0x1A)