X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fimport%2Fimport.cpp;h=b85c4f6b11c2bb88f450b3482e86874e5d22cd62;hb=324a79e0dfa2d7911efc44f79e9d82abd60d0c2b;hp=948f83ff3f6738aa92393a02401139783b34a950;hpb=c5bc76b6a1301ce594a0949f02855a6bc2190094;p=xestiaab%2F.git

diff --git a/source/import/import.cpp b/source/import/import.cpp
index 948f83f..b85c4f6 100644
--- a/source/import/import.cpp
+++ b/source/import/import.cpp
@@ -104,6 +104,18 @@ void ImportRun(frmMain *frmMainPtrInc){
 	AccountName = frmIC->GetAccount();
 	AccountType = frmIC->GetAccountType();
 
+	if (frmIC->GetDialogResult() == FALSE){
+		
+		// User decided not to import. Clean up the
+		// dialog.
+		
+		delete frmIC;
+		frmIC = NULL;
+		frmMainPtrInc->ResumeAllTimers();
+		return;
+		
+	}
+
 	delete frmIC;
 	frmIC = NULL;
 
@@ -289,10 +301,14 @@ void ImportRun(frmMain *frmMainPtrInc){
 	
 	if (AccountType != wxT("Local") && AccountType != wxT("local")){
 	
-		wxString *AccNamePostEventPtr = new wxString;
+		wxString AccNamePostEvent;
+	
+		AccNamePostEvent.Clear();
+		AccNamePostEvent.Append(AccountName);
+		AccNamePostEvent.Trim();
 	
 		wxCommandEvent accevent(SYNCACCOUNT);
-		accevent.SetClientData(AccNamePostEventPtr);
+		accevent.SetString(AccNamePostEvent);
 	
 		wxPostEvent(frmMainPtrInc, accevent);