Merge pull request #12703 from nlebeck/settingshandler-nomove-2

Pass `SettingsHandler` buffers by const ref instead of rvalue ref (since the contents are copied either way)

2 files changed, 6 insertions, 6 deletions

diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index dd84b6967b..e737a97620 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -22,9 +22,9 @@ SettingsHandler::SettingsHandler()
   Reset();
 }
 
-SettingsHandler::SettingsHandler(Buffer&& buffer)
+SettingsHandler::SettingsHandler(const Buffer& buffer)
 {
-  SetBytes(std::move(buffer));
+  SetBytes(buffer);
 }
 
 const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
@@ -32,10 +32,10 @@ const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
   return m_buffer;
 }
 
-void SettingsHandler::SetBytes(Buffer&& buffer)
+void SettingsHandler::SetBytes(const Buffer& buffer)
 {
   Reset();
-  m_buffer = std::move(buffer);
+  m_buffer = buffer;
   Decrypt();
 }
 
diff --git a/Source/Core/Common/SettingsHandler.h b/Source/Core/Common/SettingsHandler.h
index c550e8e7f4..26d0a87d72 100644
--- a/Source/Core/Common/SettingsHandler.h
+++ b/Source/Core/Common/SettingsHandler.h
@@ -25,12 +25,12 @@ public:
 
   using Buffer = std::array<u8, SETTINGS_SIZE>;
   SettingsHandler();
-  explicit SettingsHandler(Buffer&& buffer);
+  explicit SettingsHandler(const Buffer& buffer);
 
   void AddSetting(std::string_view key, std::string_view value);
 
   const Buffer& GetBytes() const;
-  void SetBytes(Buffer&& buffer);
+  void SetBytes(const Buffer& buffer);
   std::string GetValue(std::string_view key) const;
 
   void Decrypt();