Merge branch 'overlay_crash_fix' into 'master'

Fix game crash.

See merge request Mr_Goldberg/goldberg_emulator!39
This commit is contained in:
Nemirtingas 2021-05-09 08:12:09 +00:00
commit a3417e6880

View File

@ -657,7 +657,8 @@ void Steam_Overlay::OverlayProc()
std::lock_guard<std::recursive_mutex> lock(overlay_mutex); std::lock_guard<std::recursive_mutex> lock(overlay_mutex);
if (!friends.empty()) if (!friends.empty())
{ {
ImGui::ListBoxHeader("##label", friends.size()); if (ImGui::ListBoxHeader("##label", friends.size()))
{
std::for_each(friends.begin(), friends.end(), [this](std::pair<Friend const, friend_window_state> &i) std::for_each(friends.begin(), friends.end(), [this](std::pair<Friend const, friend_window_state> &i)
{ {
ImGui::PushID(i.second.id-base_friend_window_id+base_friend_item_id); ImGui::PushID(i.second.id-base_friend_window_id+base_friend_item_id);
@ -675,6 +676,7 @@ void Steam_Overlay::OverlayProc()
ImGui::ListBoxFooter(); ImGui::ListBoxFooter();
} }
} }
}
ImGui::End(); ImGui::End();
ImGui::PopFont(); ImGui::PopFont();