diff --git a/src/cascadia/TerminalApp/TabManagement.cpp b/src/cascadia/TerminalApp/TabManagement.cpp index f1ad6671b92..8d8cca21ef6 100644 --- a/src/cascadia/TerminalApp/TabManagement.cpp +++ b/src/cascadia/TerminalApp/TabManagement.cpp @@ -434,7 +434,7 @@ namespace winrt::TerminalApp::implementation // environment variables, but the user might have set one in // the settings. Expand those here. - path = { wil::ExpandEnvironmentStringsW(path.c_str()) }; + path = winrt::hstring{ wil::ExpandEnvironmentStringsW(path.c_str()) }; } if (!path.empty()) diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index 37ded61dd2f..257c7df9251 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -906,17 +906,17 @@ namespace winrt::Microsoft::Terminal::Control::implementation if (HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) == hr || HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr) { - message = { fmt::format(std::wstring_view{ RS_(L"PixelShaderNotFound") }, - (_focused ? _core.FocusedAppearance() : _core.UnfocusedAppearance()).PixelShaderPath()) }; + message = winrt::hstring{ fmt::format(std::wstring_view{ RS_(L"PixelShaderNotFound") }, + (_focused ? _core.FocusedAppearance() : _core.UnfocusedAppearance()).PixelShaderPath()) }; } else if (D2DERR_SHADER_COMPILE_FAILED == hr) { - message = { fmt::format(std::wstring_view{ RS_(L"PixelShaderCompileFailed") }) }; + message = winrt::hstring{ fmt::format(std::wstring_view{ RS_(L"PixelShaderCompileFailed") }) }; } else { - message = { fmt::format(std::wstring_view{ RS_(L"UnexpectedRendererError") }, - hr) }; + message = winrt::hstring{ fmt::format(std::wstring_view{ RS_(L"UnexpectedRendererError") }, + hr) }; } auto noticeArgs = winrt::make(NoticeLevel::Warning, std::move(message));