Index: mozilla/dom/src/base/nsJSEnvironment.cpp
===================================================================
RCS file: /cvsroot/mozilla/dom/src/base/nsJSEnvironment.cpp,v
retrieving revision 1.281
diff -up -r1.281 mozilla/dom/src/base/nsJSEnvironment.cpp
--- mozilla/dom/src/base/nsJSEnvironment.cpp
+++ mozilla/dom/src/base/nsJSEnvironment.cpp
@@ -811,7 +811,7 @@ nsJSContext::EvaluateStringWithValue(con
                                      void* aRetValue,
                                      PRBool* aIsUndefined)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   if (!mScriptsEnabled) {
     if (aIsUndefined) {
@@ -990,7 +990,7 @@ nsJSContext::EvaluateString(const nsAStr
                             nsAString *aRetValue,
                             PRBool* aIsUndefined)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   if (!mScriptsEnabled) {
     *aIsUndefined = PR_TRUE;
@@ -1126,7 +1126,7 @@ nsJSContext::CompileScript(const PRUnich
                            const char* aVersion,
                            void** aScriptObject)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   nsresult rv;
   NS_ENSURE_ARG_POINTER(aPrincipal);
@@ -1193,7 +1193,7 @@ nsJSContext::ExecuteScript(void* aScript
                            nsAString* aRetValue,
                            PRBool* aIsUndefined)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   if (!mScriptsEnabled) {
     if (aIsUndefined) {
@@ -1293,7 +1293,7 @@ nsJSContext::CompileEventHandler(void *a
                                  const char *aURL, PRUint32 aLineNo,
                                  PRBool aShared, void** aHandler)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   if (!sSecurityManager) {
     NS_ERROR("Huh, we need a script security manager to compile "
@@ -1357,7 +1357,7 @@ nsJSContext::CompileFunction(void* aTarg
                              PRBool aShared,
                              void** aFunctionObject)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   JSPrincipals *jsprin = nsnull;
 
@@ -1398,7 +1398,7 @@ nsresult
 nsJSContext::CallEventHandler(JSObject *aTarget, JSObject *aHandler,
                               uintN argc, jsval *argv, jsval *rval)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   *rval = JSVAL_VOID;
 
@@ -1466,7 +1466,7 @@ nsresult
 nsJSContext::BindCompiledEventHandler(void *aTarget, nsIAtom *aName,
                                       void *aHandler)
 {
-  NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
+  NS_ENSURE_TRUE(mIsInitialized && sIsInitialized, NS_ERROR_NOT_INITIALIZED);
 
   const char *charName = AtomToEventHandlerName(aName);
 
@@ -2032,7 +2032,7 @@ nsJSContext::DidInitializeContext()
 PRBool
 nsJSContext::IsContextInitialized()
 {
-  return mIsInitialized;
+  return mIsInitialized && sIsInitialized;
 }
 
 void