I'm an idiot. When I checked this in on Friday 5/25 I had the fix commented out
during some back and forth testing. This was r/sr=bredan and a=asa for drivers@mozilla.org The bug is 78428. git-svn-id: svn://10.0.0.236/trunk@96034 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
2ded545a76
commit
ccfedde26a
@ -587,10 +587,10 @@ InstallAddSubcomponent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
|
||||
|
||||
folder = (nsInstallFolder*)JS_GetPrivate(cx, jsObj);
|
||||
|
||||
//jsrefcount saveDepth;
|
||||
//saveDepth = JS_SuspendRequest(cx);//Need to suspend use of thread or deadlock occurs
|
||||
jsrefcount saveDepth;
|
||||
saveDepth = JS_SuspendRequest(cx);//Need to suspend use of thread or deadlock occurs
|
||||
rv= nativeThis->AddSubcomponent(b0, b1, b2, folder, b4, flags, &nativeRet);
|
||||
//JS_ResumeRequest(cx, saveDepth);
|
||||
JS_ResumeRequest(cx, saveDepth);
|
||||
if (NS_FAILED(rv))
|
||||
return JS_FALSE;
|
||||
|
||||
@ -627,10 +627,10 @@ InstallAddSubcomponent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
|
||||
|
||||
folder = (nsInstallFolder*)JS_GetPrivate(cx, jsObj);
|
||||
|
||||
//jsrefcount saveDepth;
|
||||
//saveDepth = JS_SuspendRequest(cx);//Need to suspend use of thread or deadlock occurs
|
||||
jsrefcount saveDepth;
|
||||
saveDepth = JS_SuspendRequest(cx);//Need to suspend use of thread or deadlock occurs
|
||||
rv = nativeThis->AddSubcomponent(b0, b1, b2, folder, b4, &nativeRet);
|
||||
//JS_ResumeRequest(cx, saveDepth);
|
||||
JS_ResumeRequest(cx, saveDepth);
|
||||
if (NS_FAILED(rv))
|
||||
return JS_FALSE;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user