Merge branch 'master' into nazara-next

This commit is contained in:
Jérôme Leclercq
2020-08-27 20:12:36 +02:00
21 changed files with 617 additions and 27 deletions

View File

@@ -126,7 +126,7 @@ namespace Nz
bool WindowImpl::Create(void* handle)
{
m_handle = SDL_CreateWindowFrom(handle);
if (!m_handle || !SDL_GetWindowID(m_handle))
if (!m_handle)
{
NazaraError("Invalid handle");
return false;
@@ -286,7 +286,8 @@ namespace Nz
void WindowImpl::ProcessEvents(bool block)
{
SDL_PumpEvents();
if (m_ownsWindow)
SDL_PumpEvents();
/*if (m_ownsWindow)