Verified Commit 3fb297c3 authored by ma1's avatar ma1
Browse files

fixup! Bug 42019: Empty browser's clipboard on browser shutdown 

Bug 43209: Check if any data is available before trying to retrieve it from the clipboard.
parent 5d608b10

browser/components/BrowserGlue.sys.mjs

+10 −1
Original line number Diff line number Diff line
@@ -185,8 +185,17 @@ const ClipboardPrivacy = { 
    return trans;

  },

  _computeClipboardHash() {

    const flavors = ["text/x-moz-url", "text/plain"];

    if (

      !Services.clipboard.hasDataMatchingFlavors(

        flavors,

        Ci.nsIClipboard.kGlobalClipboard

      )

    ) {

      return null;

    }

    const trans = this._createTransferable();

    ["text/x-moz-url", "text/plain"].forEach(trans.addDataFlavor);

    flavors.forEach(trans.addDataFlavor);

    try {

      Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard);

      const clipboardContent = {};