Merge pull request #10857 from AdmiralCurtiss/keyboard-mouse-name-static

InputCommon: Get rid of static strings.
dolphin-emu · Jul 15, 2022 · 1da24f6 · 1da24f6
2 parents 537fe33 + 89067e6
commit 1da24f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -293,7 +293,7 @@ std::string Joystick::Axis::GetName() const
 
 std::string Joystick::Hat::GetName() const
 {
-  static char tmpstr[] = "Hat . .";
+  char tmpstr[] = "Hat . .";
   tmpstr[4] = (char)('0' + m_index);
   tmpstr[6] = "NESW"[m_direction];
   return tmpstr;

diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -275,15 +275,15 @@ std::string KeyboardMouse::Button::GetName() const
 
 std::string KeyboardMouse::Axis::GetName() const
 {
-  static char tmpstr[] = "Axis ..";
+  char tmpstr[] = "Axis ..";
   tmpstr[5] = (char)('X' + m_index);
   tmpstr[6] = (m_range < 0 ? '-' : '+');
   return tmpstr;
 }
 
 std::string KeyboardMouse::Cursor::GetName() const
 {
-  static char tmpstr[] = "Cursor ..";
+  char tmpstr[] = "Cursor ..";
   tmpstr[7] = (char)('X' + m_index);
   tmpstr[8] = (m_positive ? '+' : '-');
   return tmpstr;

diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
@@ -226,7 +226,7 @@
 
 std::string KeyboardAndMouse::Cursor::GetName() const
 {
-  static char tmpstr[] = "Cursor ..";
+  char tmpstr[] = "Cursor ..";
   tmpstr[7] = (char)('X' + m_index);
   tmpstr[8] = (m_positive ? '+' : '-');
   return tmpstr;