sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sdk: Fix segfault when deleting hovered widget

Browse Source
This commit is contained in:
Jérôme Leclercq
2017-10-06 14:12:18 +02:00
committed by Lynix
parent 46e684c275
commit 84537fcfb8
5 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SDK/include/NDK/Canvas.inl
View File

@@ -8,9 +8,9 @@
namespace Ndk
{
inline Canvas::Canvas(WorldHandle world, Nz::EventHandler& eventHandler, Nz::CursorControllerHandle cursorController) :
m_hoveredWidget(InvalidCanvasIndex),
m_keyboardOwner(InvalidCanvasIndex),
m_cursorController(cursorController),
m_hoveredWidget(nullptr),
m_keyboardOwner(nullptr),
m_world(std::move(world))
{
m_canvas = this;
@@ -61,12 +61,12 @@ namespace Ndk
WidgetBox& entry = m_widgetBoxes[index];
entry.cursor = entry.widget->GetCursor();
if (m_cursorController && m_hoveredWidget == &entry)
if (m_cursorController && m_hoveredWidget == index)
m_cursorController->UpdateCursor(Nz::Cursor::Get(entry.cursor));
}
inline void Ndk::Canvas::SetKeyboardOwner(BaseWidget* widget)
inline void Canvas::SetKeyboardOwner(std::size_t canvasIndex)
{
m_keyboardOwner = widget;
m_keyboardOwner = canvasIndex;
}
}