Index: Source/bindings/core/v8/WindowProxy.cpp |
diff --git a/Source/bindings/core/v8/WindowProxy.cpp b/Source/bindings/core/v8/WindowProxy.cpp |
index 08c719d5fbfcfaa93b0c3de76e02a86fb7f5b061..afe97dbd50974e9d62ae70881bd94998e4fdb256 100644 |
--- a/Source/bindings/core/v8/WindowProxy.cpp |
+++ b/Source/bindings/core/v8/WindowProxy.cpp |
@@ -245,7 +245,9 @@ |
void WindowProxy::createContext() |
{ |
- if (!m_frame->client()) |
+ // This can get called after a frame is already detached... |
+ // FIXME: Fix the code so we don't need this check. |
+ if (m_frame->isLocalFrame() && !toLocalFrame(m_frame)->loader().documentLoader()) |
return; |
// Create a new environment using an empty template for the shadow |