From 8f7fb38feb2456d46ceaeb84bfeb68a83a94b812 Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Fri, 6 Sep 2002 20:19:14 +0000 Subject: [PATCH] Mfcembed no longer runs in Visual Studio Debugger, r=timeless, sr=alec, a=rjesup, b=166977 git-svn-id: svn://10.0.0.236/trunk@128989 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/base/nsEmbedAPI.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp index 3bfc965d097..a7148d6160b 100644 --- a/mozilla/embedding/base/nsEmbedAPI.cpp +++ b/mozilla/embedding/base/nsEmbedAPI.cpp @@ -97,7 +97,7 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory, nsCOMPtr registrar = do_QueryInterface(sServiceManager, &rv); if (NS_FAILED(rv)) { - NS_ASSERTION(PR_FALSE, "Could not QI to registrar"); + NS_WARNING("Could not QI to registrar"); return rv; } #ifdef DEBUG @@ -105,7 +105,7 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory, if (NS_FAILED(rv)) { - NS_ASSERTION(PR_FALSE, "Could not AutoRegister"); + NS_WARNING("Could not AutoRegister"); return rv; } @@ -126,11 +126,7 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory, if (mreDir) { rv = registrar->AutoRegister(mreDir); - if (NS_FAILED(rv)) - { - NS_ASSERTION(PR_FALSE, "Could not AutoRegister MRE components"); - return rv; - } + NS_ASSERTION(NS_SUCCEEDED(rv), "Could not AutoRegister MRE components"); } } #endif