зеркало из https://github.com/mozilla/pjs.git
72588; reset m_folderDoingCleanupInbox and m_folderDoingEmptyTrash to nsnull.
r=suresh sr=bienvenu
This commit is contained in:
Родитель
e2700ba982
Коммит
c7c1081b45
|
@ -2037,12 +2037,13 @@ nsMsgAccountManager::OnStartRunningUrl(nsIURI * aUrl)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsMsgAccountManager::OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode)
|
nsMsgAccountManager::OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode)
|
||||||
{
|
{
|
||||||
if (m_folderDoingEmptyTrash)
|
if (m_folderDoingEmptyTrash)
|
||||||
{
|
{
|
||||||
PR_CEnterMonitor(m_folderDoingEmptyTrash);
|
PR_CEnterMonitor(m_folderDoingEmptyTrash);
|
||||||
PR_CNotifyAll(m_folderDoingEmptyTrash);
|
PR_CNotifyAll(m_folderDoingEmptyTrash);
|
||||||
m_emptyTrashInProgress = PR_FALSE;
|
m_emptyTrashInProgress = PR_FALSE;
|
||||||
PR_CExitMonitor(m_folderDoingEmptyTrash);
|
PR_CExitMonitor(m_folderDoingEmptyTrash);
|
||||||
|
m_folderDoingEmptyTrash = nsnull; //reset to nsnull;
|
||||||
}
|
}
|
||||||
else if (m_folderDoingCleanupInbox)
|
else if (m_folderDoingCleanupInbox)
|
||||||
{
|
{
|
||||||
|
@ -2050,6 +2051,7 @@ nsMsgAccountManager::OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode)
|
||||||
PR_CNotifyAll(m_folderDoingCleanupInbox);
|
PR_CNotifyAll(m_folderDoingCleanupInbox);
|
||||||
m_cleanupInboxInProgress = PR_FALSE;
|
m_cleanupInboxInProgress = PR_FALSE;
|
||||||
PR_CExitMonitor(m_folderDoingCleanupInbox);
|
PR_CExitMonitor(m_folderDoingCleanupInbox);
|
||||||
|
m_folderDoingCleanupInbox=nsnull; //reset to nsnull
|
||||||
}
|
}
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче