kodi-popcornmix-exit-crash.patch

diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index f426daf34d..cac2445dda 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -1250,13 +1250,15 @@ void CGUIWindowManager::DeInitialize()
   for (const auto& entry : m_mapWindows)
   {
     CGUIWindow* pWindow = entry.second;
-    if (IsWindowActive(entry.first, false))
-    {
-      pWindow->DisableAnimations();
-      pWindow->Close(true);
+    if (pWindow) {
+      if (IsWindowActive(entry.first, false))
+      {
+        pWindow->DisableAnimations();
+        pWindow->Close(true);
+      }
+      pWindow->ResetControlStates();
+      pWindow->FreeResources(true);
     }
-    pWindow->ResetControlStates();
-    pWindow->FreeResources(true);
   }
   UnloadNotOnDemandWindows();