bootmanager: Delete container to avoid crash on game restarting
While we are at it, remove nullptr checks for deletion, since the C++ standard defines that delete does it by its own
This commit is contained in:
parent
5f2d9f282a
commit
9ff72ca9f2
|
@ -340,21 +340,16 @@ std::unique_ptr<Core::Frontend::GraphicsContext> GRenderWindow::CreateSharedCont
|
||||||
}
|
}
|
||||||
|
|
||||||
void GRenderWindow::InitRenderTarget() {
|
void GRenderWindow::InitRenderTarget() {
|
||||||
if (shared_context) {
|
|
||||||
shared_context.reset();
|
shared_context.reset();
|
||||||
}
|
|
||||||
|
|
||||||
if (context) {
|
|
||||||
context.reset();
|
context.reset();
|
||||||
}
|
|
||||||
|
|
||||||
if (child) {
|
|
||||||
delete child;
|
delete child;
|
||||||
}
|
child = nullptr;
|
||||||
|
|
||||||
|
delete container;
|
||||||
|
container = nullptr;
|
||||||
|
|
||||||
if (layout()) {
|
|
||||||
delete layout();
|
delete layout();
|
||||||
}
|
|
||||||
|
|
||||||
first_frame = false;
|
first_frame = false;
|
||||||
|
|
||||||
|
@ -375,7 +370,7 @@ void GRenderWindow::InitRenderTarget() {
|
||||||
fmt.setSwapInterval(false);
|
fmt.setSwapInterval(false);
|
||||||
|
|
||||||
child = new GGLWidgetInternal(this, shared_context.get());
|
child = new GGLWidgetInternal(this, shared_context.get());
|
||||||
QWidget* container = QWidget::createWindowContainer(child, this);
|
container = QWidget::createWindowContainer(child, this);
|
||||||
QBoxLayout* layout = new QHBoxLayout(this);
|
QBoxLayout* layout = new QHBoxLayout(this);
|
||||||
|
|
||||||
resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height);
|
resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height);
|
||||||
|
|
|
@ -166,7 +166,8 @@ private:
|
||||||
void OnMinimalClientAreaChangeRequest(
|
void OnMinimalClientAreaChangeRequest(
|
||||||
const std::pair<unsigned, unsigned>& minimal_size) override;
|
const std::pair<unsigned, unsigned>& minimal_size) override;
|
||||||
|
|
||||||
GGLWidgetInternal* child;
|
QWidget* container = nullptr;
|
||||||
|
GGLWidgetInternal* child = nullptr;
|
||||||
|
|
||||||
QByteArray geometry;
|
QByteArray geometry;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue