anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

handle empty hresult_error message specially

Browse source
This commit is contained in:
mjk 2021-03-19 22:44:38 +00:00 committed by LAGonauta
parent c44b1daaf7
commit ab6ce05aec
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/windows-notification/api/src/ginvoke.cpp
View file

@ -16,11 +16,17 @@ namespace glib::impl
const char *ptr = nullptr; const char *ptr = nullptr;
try try
{ {
ptr = wsview_to_char(e.message()); const auto wmsg = std::wstring_view{e.message()};
if (not wmsg.empty())
{
ptr = wsview_to_char(wmsg);
std::string msg{ptr}; std::string msg{ptr};
g_free(const_cast<char *>(ptr)); // WTF? Deletion is not modification! g_free(const_cast<char *>(ptr)); // WTF? Deletion is not modification!
return {{ e.code(), {std::move(msg)} }}; return {{ e.code(), {std::move(msg)} }};
} }
else
return {{ e.code(), {"<no error description>"} }};
}
catch (...) catch (...)
{ {
g_free(const_cast<char *>(ptr)); g_free(const_cast<char *>(ptr));