From 79f5cfd7797bb433d9e7745d410091e28a5ce02c Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de" <cbiesinger%web.de>
Date: Mon, 12 Sep 2005 21:33:47 +0000
Subject: [PATCH] 308018 only call SendFTPCommand if we haven't been cancelled
 r+sr=darin

---
 netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
index 74794caf74e..55a1cf4b5e1 100644
--- a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
+++ b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
@@ -2483,9 +2483,14 @@ void
 nsFtpState::DataConnectionEstablished()
 {
     LOG(("(%x) Data Connection established.", this));
-    
     mWaitingForDConn = PR_FALSE;
 
+    // If we no longer have a channel, we don't need this connection
+    if (!mChannel) {
+        LOG(("    Ignoring data connection"));
+        return;
+    }
+
     // sending empty string with (mWaitingForDConn == PR_FALSE) will cause the 
     // control socket to write out its buffer.
     nsCString a("");