Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here
This commit is contained in:
commit
d77f483871
|
|
@ -72,7 +72,7 @@ namespace Nz
|
||||||
{
|
{
|
||||||
auto it = m_callbacks.emplace(handler, std::make_unique<Callback>(callbacks)).first;
|
auto it = m_callbacks.emplace(handler, std::make_unique<Callback>(callbacks)).first;
|
||||||
|
|
||||||
handler->userData = &it->second;
|
handler->userData = it->second.get();
|
||||||
|
|
||||||
if (callbacks.startCallback)
|
if (callbacks.startCallback)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue