- Fixed: Subversion: check out from a URL which requires authenticati…

…on does not work if the user is prompted for login git-svn-id: https://codelite.svn.sourceforge.net/svnroot/codelite/trunk@4049 9da81c78-c036-0410-9e1f-a2b0375e4b5a
lukester1975 · Apr 14, 2010 · 514a148 · 514a148
1 parent f32ed75
commit 514a148
Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Subversion2/subversion2.cpp b/Subversion2/subversion2.cpp
@@ -573,8 +573,8 @@ bool Subversion2::LoginIfNeeded(wxCommandEvent& event, const wxString &workingDi
 	loginString.Empty();
 	if(loginFailed) {
 		SvnLoginDialog dlg(GetManager()->GetTheApp()->GetTopWindow());
-		if (dlg.ShowModal() == wxID_OK) {
-			loginString << wxT(" --username ") << dlg.GetUsername() << wxT(" --password ") << dlg.GetPassword() << wxT(" ");
+		if (dlg.ShowModal() == wxID_OK) {
+			loginString << wxT(" --username ") << dlg.GetUsername() << wxT(" --password ") << dlg.GetPassword() << wxT(" ");
 			// Store the user name and password
 			db.SetLogin(repoUrl, dlg.GetUsername(), dlg.GetPassword());
 			return true;

diff --git a/Subversion2/svn_console.cpp b/Subversion2/svn_console.cpp
@@ -123,6 +123,11 @@ void SvnConsole::OnProcessEnd(wxCommandEvent& event)
 {
 	ProcessEventData *ped = (ProcessEventData *)event.GetClientData();
 	delete ped;
+
+	if ( m_process ) {
+		delete m_process;
+		m_process = NULL;
+	}
 
 	if (m_handler) {
 
@@ -151,11 +156,6 @@ void SvnConsole::OnProcessEnd(wxCommandEvent& event)
 		m_handler = NULL;
 	}
 
-	if ( m_process ) {
-		delete m_process;
-		m_process = NULL;
-	}
-
 	m_workingDirectory.Clear();
 	m_url.Clear();
 }
@@ -259,7 +259,7 @@ bool SvnConsole::DoExecute(const wxString& cmd, SvnCommandHandler* handler, cons
 	m_printProcessOutput = printProcessOutput;
 	if (m_process) {
 		// another process is already running...
-		//AppendText(svnANOTHER_PROCESS_RUNNING);
+		AppendText(svnANOTHER_PROCESS_RUNNING);
 		if (handler)
 			delete handler;
 		return false;