From 0ae6e168b707fad44599c2b16dd95e4fec366813 Mon Sep 17 00:00:00 2001 From: "dveditz%netscape.com" Date: Sun, 13 Feb 2000 17:48:25 +0000 Subject: [PATCH] backing out, profiles don't use the registry SERVICE git-svn-id: svn://10.0.0.236/trunk@60649 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/profile/src/nsProfileAccess.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mozilla/profile/src/nsProfileAccess.cpp b/mozilla/profile/src/nsProfileAccess.cpp index d0ee81f0fc0..abd58524b71 100644 --- a/mozilla/profile/src/nsProfileAccess.cpp +++ b/mozilla/profile/src/nsProfileAccess.cpp @@ -99,6 +99,10 @@ nsProfileAccess::~nsProfileAccess() PRBool openalready = PR_FALSE; + m_registry->IsOpen( &openalready); + if (openalready) + m_registry->Close(); + // Release all resources. CRTFREEIF(mCurrentProfile); CRTFREEIF(mVersion); @@ -131,7 +135,7 @@ nsProfileAccess::CloseRegistry() { nsresult rv = NS_OK; -// rv = m_registry->Close(); + rv = m_registry->Close(); return rv; } @@ -159,7 +163,7 @@ nsProfileAccess::OpenRegistry() if (NS_FAILED(rv)) return rv; if (!openalready) - rv = m_registry->OpenWellKnownRegistry(nsIRegistry::ApplicationRegistry); + rv = m_registry->OpenDefault(); return rv; } @@ -907,6 +911,7 @@ nsProfileAccess::Get4xProfileInfo(const char *registryName) rv = enumKeys->Next(); if (NS_FAILED(rv)) return rv; } + oldReg->Close(); #elif defined (XP_BEOS) #else