Index: nsWebBrowserPersist.cpp
===================================================================
RCS file: /cvsroot/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp,v
retrieving revision 1.109
diff -p -u -u -p -U10 -r1.109 nsWebBrowserPersist.cpp
--- nsWebBrowserPersist.cpp	26 Apr 2005 14:07:21 -0000	1.109
+++ nsWebBrowserPersist.cpp	13 Oct 2005 21:12:28 -0000
@@ -273,45 +273,41 @@ NS_INTERFACE_MAP_END
 // nsWebBrowserPersist::nsIInterfaceRequestor
 //*****************************************************************************
 
 NS_IMETHODIMP nsWebBrowserPersist::GetInterface(const nsIID & aIID, void **aIFace)
 {
     NS_ENSURE_ARG_POINTER(aIFace);
 
     *aIFace = nsnull;
 
     nsresult rv = QueryInterface(aIID, aIFace);
-    if (NS_SUCCEEDED(rv) && *aIFace)
+    if (NS_SUCCEEDED(rv))
     {
         return rv;
     }
     
     if (mProgressListener && (aIID.Equals(NS_GET_IID(nsIAuthPrompt)) 
                              || aIID.Equals(NS_GET_IID(nsIPrompt))))
     {
         nsCOMPtr<nsISupports> sup = do_QueryInterface(mProgressListener);
         if (sup)
         {
             sup->QueryInterface(aIID, aIFace);
             if (*aIFace)
                 return NS_OK;
         }
+    }
 
-        nsCOMPtr<nsIInterfaceRequestor> req = do_QueryInterface(mProgressListener);
-        if (req)
-        {
-            req->GetInterface(aIID, aIFace);
-            if (*aIFace)
-            {
-                return NS_OK;
-            }
-        }
+    nsCOMPtr<nsIInterfaceRequestor> req = do_QueryInterface(mProgressListener);
+    if (req)
+    {
+        return req->GetInterface(aIID, aIFace);
     }
 
     return NS_ERROR_NO_INTERFACE;
 }
 
 
 //*****************************************************************************
 // nsWebBrowserPersist::nsIWebBrowserPersist
 //*****************************************************************************