diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-08 16:30:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-08 16:31:22 +0300 |
| commit | c0cc78df590a81b15d8a7eb1590edbec8fec6f1a (patch) | |
| tree | 2689c79861db5b988074dcd890b645e895f06931 | |
| parent | edb10e8879272f9d377d08dab6a081aa1acd5205 (diff) | |
| download | plus-c0cc78df590a81b15d8a7eb1590edbec8fec6f1a.tar.gz plus-c0cc78df590a81b15d8a7eb1590edbec8fec6f1a.tar.bz2 plus-c0cc78df590a81b15d8a7eb1590edbec8fec6f1a.tar.xz plus-c0cc78df590a81b15d8a7eb1590edbec8fec6f1a.zip | |
Clean global font pointer on gui deletion.
| -rw-r--r-- | src/gui/gui.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/widget.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index fd3f8bd2a..06afeccc6 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -294,6 +294,7 @@ Gui::~Gui() delete2(mFocusHandler); Label::finalCleanup(); Tab::finalCleanup(); + Widget::cleanGlobalFont(); } void Gui::logic() diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h index 92b345cea..3601570cb 100644 --- a/src/gui/widgets/widget.h +++ b/src/gui/widgets/widget.h @@ -644,6 +644,9 @@ class Widget notfinal : public Widget2 static Font *getGloablFont() { return mGlobalFont; } + static void cleanGlobalFont() + { mGlobalFont = nullptr; } + /** * Sets the font for the widget. If NULL is passed, the global font * will be used. |