SDK: Fix console layer having trouble with late constructed windows
Former-commit-id: 1af4cce1d920401963c3693661c19f0af5d23641 [formerly c5fb7cf9da6dd18a887b5d67fc2f43c135d5bee2] [formerly 9718a9b7c1bf161b46c085a82ab1bce46c045d6d [formerly cb26a07e6ce48b30727195e8f26e6fc6670ff86a]] Former-commit-id: ccd4866237e7d9d6cd3a83ff6a030d8acd053010 [formerly 9745165a6b024df81317dc96126e8209bee4bd32] Former-commit-id: 43b65ae9fb7793e9a9e79d1e8e9a718e4c3edce3
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
|
||||
#include <Nazara/Utility/Window.hpp>
|
||||
#include <Nazara/Core/CallOnExit.hpp>
|
||||
#include <Nazara/Core/Error.hpp>
|
||||
#include <Nazara/Core/ErrorFlags.hpp>
|
||||
#include <Nazara/Core/LockGuard.hpp>
|
||||
@@ -60,25 +61,22 @@ namespace Nz
|
||||
else if (style & WindowStyle_Closable || style & WindowStyle_Resizable)
|
||||
style |= WindowStyle_Titlebar;
|
||||
|
||||
m_impl = new WindowImpl(this);
|
||||
if (!m_impl->Create(mode, title, style))
|
||||
std::unique_ptr<WindowImpl> impl = std::make_unique<WindowImpl>(this);
|
||||
if (!impl->Create(mode, title, style))
|
||||
{
|
||||
NazaraError("Failed to create window implementation");
|
||||
delete m_impl;
|
||||
m_impl = nullptr;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
m_impl = impl.release();
|
||||
CallOnExit destroyOnFailure([this] () { Destroy(); });
|
||||
|
||||
m_closed = false;
|
||||
m_ownsWindow = true;
|
||||
|
||||
if (!OnWindowCreated())
|
||||
{
|
||||
NazaraError("Failed to initialize window extension");
|
||||
delete m_impl;
|
||||
m_impl = nullptr;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -93,6 +91,10 @@ namespace Nz
|
||||
if (opened)
|
||||
m_impl->SetPosition(position.x, position.y);
|
||||
|
||||
OnWindowResized();
|
||||
|
||||
destroyOnFailure.Reset();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user