Merge pull request #9297 from JosJuice/movie-game-id-comparison

Movie: Fix 83b9fef regressions
dolphin-emu · Nov 28, 2020 · 738e1a6 · 738e1a6
2 parents cf32c4d + 5642772
commit 738e1a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
@@ -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());

diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h
@@ -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)