diff --git a/include/Nazara/Utility/Cursor.hpp b/include/Nazara/Utility/Cursor.hpp index ae8dd08b5..7fe0b2831 100644 --- a/include/Nazara/Utility/Cursor.hpp +++ b/include/Nazara/Utility/Cursor.hpp @@ -18,6 +18,7 @@ namespace Nz class NAZARA_UTILITY_API Cursor { + friend class Utility; friend class WindowImpl; public: diff --git a/src/Nazara/Utility/Utility.cpp b/src/Nazara/Utility/Utility.cpp index 87b154157..3234869ad 100644 --- a/src/Nazara/Utility/Utility.cpp +++ b/src/Nazara/Utility/Utility.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -110,6 +111,13 @@ namespace Nz NazaraError("Failed to initialize window's system"); return false; } + + // Must be initialized after Window + if (!Cursor::Initialize()) + { + NazaraError("Failed to initialize cursors"); + return false; + } } // On enregistre les loaders pour les extensions @@ -180,7 +188,9 @@ namespace Nz Loaders::UnregisterSTBLoader(); Loaders::UnregisterSTBSaver(); + Cursor::Uninitialize(); //< Must be done before Window Window::Uninitialize(); + VertexDeclaration::Uninitialize(); Skeleton::Uninitialize(); PixelFormat::Uninitialize();