From bd793930990366631873cd7af22dbaef7c5a2fa9 Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Wed, 19 Jan 2000 00:31:52 +0000 Subject: [PATCH] Fix for #18679 git-svn-id: svn://10.0.0.236/trunk@58179 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsObjectFrame.cpp | 9 ++++++--- mozilla/layout/html/base/src/nsObjectFrame.cpp | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 2cfa35c3bda..99d13c78383 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -1784,11 +1784,14 @@ NS_IMETHODIMP nsPluginInstanceOwner::ShowStatus(const char *aStatusMsg) { nsCOMPtr browserWindow(do_QueryInterface(rootContainer)); - if (rootContainer) + if(browserWindow) { - nsAutoString msg = nsAutoString(aStatusMsg); + if (rootContainer) + { + nsAutoString msg = nsAutoString(aStatusMsg); - rv = browserWindow->SetStatus(msg.GetUnicode()); + rv = browserWindow->SetStatus(msg.GetUnicode()); + } } } } diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 2cfa35c3bda..99d13c78383 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -1784,11 +1784,14 @@ NS_IMETHODIMP nsPluginInstanceOwner::ShowStatus(const char *aStatusMsg) { nsCOMPtr browserWindow(do_QueryInterface(rootContainer)); - if (rootContainer) + if(browserWindow) { - nsAutoString msg = nsAutoString(aStatusMsg); + if (rootContainer) + { + nsAutoString msg = nsAutoString(aStatusMsg); - rv = browserWindow->SetStatus(msg.GetUnicode()); + rv = browserWindow->SetStatus(msg.GetUnicode()); + } } } }