File fix-convert-wxString-issue.patch of Package pcsx2
From afae6c5fbc70b16f320db45f59973d3f8e7c0c67 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 10 Sep 2022 21:17:17 +0200
Subject: [PATCH] Hacks for #6115
---
pcsx2/Linux/LnxConsolePipe.cpp | 2 +-
pcsx2/PrecompiledHeader.h | 1 +
pcsx2/gui/i18n.cpp | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pcsx2/Linux/LnxConsolePipe.cpp b/pcsx2/Linux/LnxConsolePipe.cpp
index 8b3510262cde..d8cc0cdfdc5b 100644
--- a/pcsx2/Linux/LnxConsolePipe.cpp
+++ b/pcsx2/Linux/LnxConsolePipe.cpp
@@ -124,7 +124,7 @@ void LinuxPipeThread::ExecuteTaskInThread()
{
ConsoleColorScope cs(m_color);
- Console.WriteRaw(fromUTF8(buffer));
+ // Console.WriteRaw(fromUTF8(buffer));
}
}
}
diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h
index bc1921f52caa..09669fd86ce3 100644
--- a/pcsx2/PrecompiledHeader.h
+++ b/pcsx2/PrecompiledHeader.h
@@ -38,6 +38,7 @@
#endif
#ifndef PCSX2_CORE
+#include "gui/StringHelpers.h"
#include <wx/gdicmn.h>
#include <wx/gdiobj.h>
#include <wx/string.h>
diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp
index f5771c21db10..4be86a1aba31 100644
--- a/pcsx2/gui/i18n.cpp
+++ b/pcsx2/gui/i18n.cpp
@@ -62,7 +62,7 @@ LangPackEnumeration::LangPackEnumeration( wxLanguage langId )
LangPackEnumeration::LangPackEnumeration()
: wxLangId(wxLANGUAGE_DEFAULT)
, canonicalName(L"default")
- , englishName(L"System Default" + _(" (default)"))
+ , englishName(L"System Default" + wxString(_(" (default)")))
{
int sysLang = wxLocale::GetSystemLanguage();