Bug 806011 - Remember URL of message opened from file so that changing the text encoding works. r=mkmelin a=rkent
authorJorg K
Sat, 30 Jan 2016 23:16:15 +0100
changeset 26703 18da5ccc17b1639538f3f3f4445d45e4b85541f9
parent 26702 93ef1a084244006e0f88d5ae845dc910a2db2be4
child 26704 0e6bd151c024421bdb3096592e79aa8b1a7ba77a
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, rkent
bugs806011
Bug 806011 - Remember URL of message opened from file so that changing the text encoding works. r=mkmelin a=rkent
mailnews/base/src/nsMessenger.cpp
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -560,16 +560,17 @@ nsMessenger::LoadURL(nsIDOMWindow *aWin,
   }
 
   nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
   rv = mDocShell->CreateLoadInfo(getter_AddRefs(loadInfo));
   NS_ENSURE_SUCCESS(rv, rv);
   loadInfo->SetLoadType(nsIDocShellLoadInfo::loadNormal);
   AddMsgUrlToNavigateHistory(aURL);
   mNavigatingToUri.Truncate();
+  mLastDisplayURI = aURL; // Remember the last uri we displayed.
   return mDocShell->LoadURI(uri, loadInfo, 0, true);
 }
 
 NS_IMETHODIMP nsMessenger::SaveAttachmentToFile(nsIFile *aFile,
                                                 const nsACString &aURL,
                                                 const nsACString &aMessageUri,
                                                 const nsACString &aContentType,
                                                 nsIUrlListener *aListener)