summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-18 18:51:15 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-18 18:51:15 +0300
commite469ab2f1940cb04b53bb3b72cc7b5a0cd0669b0 (patch)
treebfeb4a907acd9e0b6838e393eccf3bf6da44ccad /src/gui/gui.cpp
parentc8b1e6e5455dd0c9c51b6b212478ed1e5aa1af4c (diff)
downloadmv-e469ab2f1940cb04b53bb3b72cc7b5a0cd0669b0.tar.gz
mv-e469ab2f1940cb04b53bb3b72cc7b5a0cd0669b0.tar.bz2
mv-e469ab2f1940cb04b53bb3b72cc7b5a0cd0669b0.tar.xz
mv-e469ab2f1940cb04b53bb3b72cc7b5a0cd0669b0.zip
Add some clang fixes.
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index f0a4137c1..410891416 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -275,7 +275,10 @@ Gui::~Gui()
if (windowContainer)
windowContainer->slowLogic();
- delete getTop();
+ Widget *top = mTop;
+ if (Widget::widgetExists(mTop))
+ setTop(nullptr);
+ delete top;
delete2(mGuiFont);
delete2(boldFont);
@@ -283,14 +286,9 @@ Gui::~Gui()
delete2(mSecureFont);
delete2(mInfoParticleFont);
delete2(mNpcFont);
-
delete2(guiInput);
-
delete2(theme);
- if (Widget::widgetExists(mTop))
- setTop(nullptr);
-
delete2(mFocusHandler);
Label::finalCleanup();
Tab::finalCleanup();