From 8e3641061a44cd9a78ff32b7840ee2f866ed8206 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 27 Mar 2018 01:07:26 +0300
Subject: Fix adding possible null pointer to window.

---
 src/gui/widgets/basiccontainer.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp
index faf89f731..92611687d 100644
--- a/src/gui/widgets/basiccontainer.cpp
+++ b/src/gui/widgets/basiccontainer.cpp
@@ -63,6 +63,7 @@
 
 #include "gui/widgets/basiccontainer.h"
 
+#include "utils/checkutils.h"
 #include "utils/foreach.h"
 
 #include "render/graphics.h"
@@ -79,6 +80,12 @@ BasicContainer::~BasicContainer()
 
 void BasicContainer::moveToTop(Widget *const widget) restrict2
 {
+    if (widget == nullptr)
+    {
+        reportAlways("BasicContainer::moveToTop empty widget.");
+        return;
+    }
+
     FOR_EACH (WidgetListIterator, iter, mWidgets)
     {
         if (*iter == widget)
@@ -101,6 +108,11 @@ void BasicContainer::moveToTop(Widget *const widget) restrict2
 
 void BasicContainer::moveToBottom(Widget *const widget) restrict2
 {
+    if (widget == nullptr)
+    {
+        reportAlways("BasicContainer::moveToBottom empty widget.");
+        return;
+    }
     const WidgetListIterator iter = std::find(mWidgets.begin(),
         mWidgets.end(), widget);
     if (iter != mWidgets.end())
-- 
cgit v1.2.3-60-g2f50