diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-08-28 22:45:19 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-08-29 00:18:57 +0300 |
commit | 3db999ff2d3324ffad6ba6a469ca224c8d864dc3 (patch) | |
tree | 78ecfd05c1267f7360e42876072ddb21efa1a096 /src/gui/shortcutwindow.cpp | |
parent | 57726c7324f165c70671fc5b05d6c0964f56b870 (diff) | |
download | manaplus-3db999ff2d3324ffad6ba6a469ca224c8d864dc3.tar.gz manaplus-3db999ff2d3324ffad6ba6a469ca224c8d864dc3.tar.bz2 manaplus-3db999ff2d3324ffad6ba6a469ca224c8d864dc3.tar.xz manaplus-3db999ff2d3324ffad6ba6a469ca224c8d864dc3.zip |
add some more missing checks.
Diffstat (limited to 'src/gui/shortcutwindow.cpp')
-rw-r--r-- | src/gui/shortcutwindow.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index 87b43e758..8bd64c9ff 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -74,7 +74,8 @@ ShortcutWindow::ShortcutWindow(const std::string &title, mDragOffsetY = 0; content->setWidget2(this); - setupWindow->registerWindowForReset(this); + if (setupWindow) + setupWindow->registerWindowForReset(this); const int border = SCROLL_PADDING * 2 + getPadding() * 2; setMinWidth(mItems->getBoxWidth() + border); @@ -123,7 +124,8 @@ ShortcutWindow::ShortcutWindow(const std::string &title, mDragOffsetX = 0; mDragOffsetY = 0; - setupWindow->registerWindowForReset(this); + if (setupWindow) + setupWindow->registerWindowForReset(this); const int border = SCROLL_PADDING * 2 + getPadding() * 2; |