зеркало из https://github.com/mozilla/gecko-dev.git
fix 370277 imap filters duplicate messages if msgs moved to local folder and imap inbox is selected on startup, sr=mscott
This commit is contained in:
Родитель
1f337f4de0
Коммит
b25f8dfbfe
|
@ -795,7 +795,7 @@ nsImapMailFolder::UpdateFolder(nsIMsgWindow *msgWindow)
|
||||||
if (!canOpenThisFolder)
|
if (!canOpenThisFolder)
|
||||||
selectFolder = PR_FALSE;
|
selectFolder = PR_FALSE;
|
||||||
// don't run select if we can't select the folder...
|
// don't run select if we can't select the folder...
|
||||||
if (NS_SUCCEEDED(rv) && !m_updatingFolder && selectFolder)
|
if (NS_SUCCEEDED(rv) && !m_urlRunning && selectFolder)
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsIImapService> imapService = do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
|
nsCOMPtr<nsIImapService> imapService = do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
@ -829,7 +829,7 @@ nsImapMailFolder::UpdateFolder(nsIMsgWindow *msgWindow)
|
||||||
}
|
}
|
||||||
else if (NS_SUCCEEDED(rv)) // tell the front end that the folder is loaded if we're not going to
|
else if (NS_SUCCEEDED(rv)) // tell the front end that the folder is loaded if we're not going to
|
||||||
{ // actually run a url.
|
{ // actually run a url.
|
||||||
if (!m_urlRunning) // if we're already running a url, we'll let that one send the folder loaded
|
if (!m_updatingFolder) // if we're already running an update url, we'll let that one send the folder loaded
|
||||||
NotifyFolderEvent(mFolderLoadedAtom);
|
NotifyFolderEvent(mFolderLoadedAtom);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче