wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 22:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2021-09-16 10:24:34 +08:00
commit e5ac0b779f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dom/ipc/ContentChild.cpp
View file

@ -2817,10 +2817,10 @@ bool
ContentChild::RecvGetFilesResponse(const nsID& aUUID, ContentChild::RecvGetFilesResponse(const nsID& aUUID,
const GetFilesResponseResult& aResult) const GetFilesResponseResult& aResult)
{ {
GetFilesHelperChild* child = mGetFilesPendingRequests.GetWeak(aUUID); RefPtr<GetFilesHelperChild> child;
// This object can already been deleted in case DeleteGetFilesRequest has // This object can already been deleted in case DeleteGetFilesRequest has
// been called when the response was sending by the parent. // been called when the response was sending by the parent.
if (!child) { if (!mGetFilesPendingRequests.Remove(aUUID, getter_AddRefs(child))) {
return true; return true;
} }
@ -2841,7 +2841,6 @@ ContentChild::RecvGetFilesResponse(const nsID& aUUID,
child->Finished(succeeded ? NS_OK : NS_ERROR_OUT_OF_MEMORY); child->Finished(succeeded ? NS_OK : NS_ERROR_OUT_OF_MEMORY);
} }
mGetFilesPendingRequests.Remove(aUUID);
return true; return true;
} }

1
modules/libpref/init/all.js
View file

@ -1353,6 +1353,7 @@ pref("network.protocol-handler.external.iehistory", false);
pref("network.protocol-handler.external.ierss", false); pref("network.protocol-handler.external.ierss", false);
pref("network.protocol-handler.external.mk", false); pref("network.protocol-handler.external.mk", false);
pref("network.protocol-handler.external.ms-help", false); pref("network.protocol-handler.external.ms-help", false);
pref("network.protocol-handler.external.mk", false);
pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.res", false);
pref("network.protocol-handler.external.shell", false); pref("network.protocol-handler.external.shell", false);
pref("network.protocol-handler.external.vnd.ms.radio", false); pref("network.protocol-handler.external.vnd.ms.radio", false);