diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
| commit | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch) | |
| tree | 2d85d112997176e9ab765e638b0e7f2e16677b83 /src/gui/widgets/popup.cpp | |
| parent | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff) | |
| parent | 8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff) | |
| download | mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2 mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/widgets/popup.cpp')
| -rw-r--r-- | src/gui/widgets/popup.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 1114b4a5e..2116de113 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -27,6 +27,8 @@ #include "gui/viewport.h" +#include "utils/delete2.h" + #include "debug.h" Popup::Popup(const std::string &name, @@ -51,7 +53,6 @@ Popup::Popup(const std::string &name, if (skin == "") skin = "popup.xml"; - Theme *const theme = Theme::instance(); if (theme) { mSkin = theme->load(skin, "popup.xml"); @@ -73,12 +74,10 @@ Popup::~Popup() { logger->log("Popup::~Popup(\"%s\")", mPopupName.c_str()); - delete mVertexes; - mVertexes = nullptr; + delete2(mVertexes); if (mSkin) { - Theme *const theme = Theme::instance(); if (theme) theme->unload(mSkin); mSkin = nullptr; |