From a62294de074324fd1a5ff3772cb2c110c2c0e8f8 Mon Sep 17 00:00:00 2001 From: "michaelp%netscape.com" Date: Tue, 15 Sep 1998 20:22:37 +0000 Subject: [PATCH] cleaned up some link jumping nonsense. git-svn-id: svn://10.0.0.236/trunk@10071 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsObjectFrame.cpp | 5 +++-- mozilla/layout/html/base/src/nsObjectFrame.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 393c9e7994d..d9a84b980ec 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -803,13 +803,14 @@ NS_IMETHODIMP nsPluginInstanceOwner :: GetURL(const char *aURL, const char *aTar nsIURL *docURL = doc->GetDocumentURL(); // Create an absolute URL - nsresult rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl); + rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl); NS_RELEASE(shell); NS_RELEASE(docURL); NS_RELEASE(doc); - rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull); + if (NS_OK == rv) + rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull); NS_RELEASE(lh); } diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 393c9e7994d..d9a84b980ec 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -803,13 +803,14 @@ NS_IMETHODIMP nsPluginInstanceOwner :: GetURL(const char *aURL, const char *aTar nsIURL *docURL = doc->GetDocumentURL(); // Create an absolute URL - nsresult rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl); + rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl); NS_RELEASE(shell); NS_RELEASE(docURL); NS_RELEASE(doc); - rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull); + if (NS_OK == rv) + rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull); NS_RELEASE(lh); }