aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Carroll <thecarrolls@jiminger.com>2012-09-18 00:05:07 -0400
committerJim Carroll <thecarrolls@jiminger.com>2012-09-18 00:05:07 -0400
commitba2c709f07022b52838c95ce616e2816bb9141ed (patch)
treecf7e1eab7687bce74dda33383acb5ae1aa270f22
parent6810e4f9306d4a3a80ec15eea6ee2c019fab8a9c (diff)
deallocating needs to unhook the Interceptor or it may call methods on a deleted window.
-rw-r--r--xbmc/interfaces/legacy/Window.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/xbmc/interfaces/legacy/Window.cpp b/xbmc/interfaces/legacy/Window.cpp
index 64f53d6403..c5e98cc5e9 100644
--- a/xbmc/interfaces/legacy/Window.cpp
+++ b/xbmc/interfaces/legacy/Window.cpp
@@ -171,6 +171,12 @@ namespace XBMCAddon
}
vecControls.clear();
+
+ if (window)
+ {
+ window->clear();
+ window = NULL;
+ }
}
void Window::setWindow(InterceptorBase* _window)