X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=c32e61dca8975ce2dc1ad5f5437fabe7392a7dc7;hb=2031be04c0036b44c40c473a07fdd31e898b2a11;hp=bcbad5c1f484ad2a196b66fb4b5bf4dd2978b7e2;hpb=d71757f322746223ba535a9b04239541c81e3da3;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index bcbad5c..c32e61d 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -1108,7 +1108,7 @@ void frmMain::ShowContactInfo( wxListEvent& event )
     
 	OldSessionID = SessionID;
 	SessionID = wxString::Format(wxT("%i"), rand() % 32768);
-	LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList, ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
+	LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList, ContactBackgroundColour);
 	ActiveFilename = ContactsFileIndex[ContactSeekNum];
     
 }
@@ -1438,6 +1438,13 @@ void frmMain::LoadPreferences(bool skipWindowSizeReload){
     
 	XABPreferences preferences(preffilename);
     
+	// Clear the active account/filename information and account list.
+
+	ActiveAccount = "";
+	ActiveAccountType = "";
+	ActiveFilename = "";
+	lstContacts->DeleteAllItems();
+
 	// Setup the main window position (if needed).
     
 	bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));