diff --git a/apps/openmw/mwgui/controllerbuttonsoverlay.cpp b/apps/openmw/mwgui/controllerbuttonsoverlay.cpp index 1d937c1e63..49a65b7e5a 100644 --- a/apps/openmw/mwgui/controllerbuttonsoverlay.cpp +++ b/apps/openmw/mwgui/controllerbuttonsoverlay.cpp @@ -48,9 +48,9 @@ namespace MWGui for (size_t i = 0; i < mButtons.size(); i++) { - getWidget(mButtons[i].mImage, "Btn" + sButtonDefs[i].mName + "Image"); - getWidget(mButtons[i].mText, "Btn" + sButtonDefs[i].mName + "Text"); - getWidget(mButtons[i].mHBox, "Btn" + sButtonDefs[i].mName); + getWidget(mButtons[i].mImage, "Btn" + std::string(sButtonDefs[i].mName) + "Image"); + getWidget(mButtons[i].mText, "Btn" + std::string(sButtonDefs[i].mName) + "Text"); + getWidget(mButtons[i].mHBox, "Btn" + std::string(sButtonDefs[i].mName)); if (sButtonDefs[i].mInputType == InputType_Axis) setIcon(mButtons[i].mImage, inputMgr->getControllerAxisIcon(sButtonDefs[i].mId.mAxis)); diff --git a/apps/openmw/mwgui/controllerbuttonsoverlay.hpp b/apps/openmw/mwgui/controllerbuttonsoverlay.hpp index df97be1678..5d451e4056 100644 --- a/apps/openmw/mwgui/controllerbuttonsoverlay.hpp +++ b/apps/openmw/mwgui/controllerbuttonsoverlay.hpp @@ -2,6 +2,7 @@ #define MWGUI_CONTROLLERBUTTONSOVERLAY_H #include +#include #include #include @@ -49,7 +50,7 @@ namespace MWGui struct ButtonDefinition { Button mButton; - std::string mName; + std::string_view mName; InputType mInputType; union {