From c7481581828a1cd6207f525aa575799378987e40 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 27 Jan 2017 10:11:36 -0500
Subject: [PATCH] SettingsHandler: Make GenerateSerialNumber static

This doesn't depend on class internals.
---
 Source/Core/Common/SettingsHandler.cpp | 2 +-
 Source/Core/Common/SettingsHandler.h   | 2 +-
 Source/Core/Core/Boot/Boot_BS2Emu.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index 743e6de269..54efd77f70 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -132,7 +132,7 @@ void SettingsHandler::WriteByte(u8 b)
   m_key = (m_key >> 31) | (m_key << 1);
 }
 
-const std::string SettingsHandler::generateSerialNumber()
+std::string SettingsHandler::GenerateSerialNumber()
 {
   time_t rawtime;
   tm* timeinfo;
diff --git a/Source/Core/Common/SettingsHandler.h b/Source/Core/Common/SettingsHandler.h
index 41cd730ac1..54ef8f34cd 100644
--- a/Source/Core/Common/SettingsHandler.h
+++ b/Source/Core/Common/SettingsHandler.h
@@ -33,7 +33,7 @@ public:
 
   void Decrypt();
   void Reset();
-  const std::string generateSerialNumber();
+  static std::string GenerateSerialNumber();
 
 private:
   void WriteByte(u8 b);
diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
index 7ab94af379..e3ba2536da 100644
--- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
@@ -211,7 +211,7 @@ bool CBoot::SetupWiiMemory(u64 ios_title_id)
     if (Core::g_want_determinism)
       serno = "123456789";
     else
-      serno = gen.generateSerialNumber();
+      serno = SettingsHandler::GenerateSerialNumber();
     INFO_LOG(BOOT, "No previous serial number found, generated one instead: %s", serno.c_str());
   }
   else