Merge pull request robinrodricks#295 from unreal/master

add fix for robinrodricks#291 to SetDataTypeAsync
oldpepper · May 2, 2018 · 75d895b · 75d895b
2 parents f604fcd + c9556ee
commit 75d895b
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/FluentFTP/Client/FtpClient_LowLevel.cs b/FluentFTP/Client/FtpClient_LowLevel.cs
@@ -1452,26 +1452,30 @@ protected void EndSetDataType(IAsyncResult ar) {
 		/// </summary>
 		/// <param name="type">ASCII/Binary</param>
 		protected async Task SetDataTypeAsync(FtpDataType type) {
-            //TODO:  Add cancellation support
-            FtpReply reply;
-            switch (type)
-            {
-                case FtpDataType.ASCII:
-                    if (!(reply = await ExecuteAsync("TYPE A")).Success)
-                        throw new FtpCommandException(reply);
-                    break;
-                case FtpDataType.Binary:
-                    if (!(reply = await ExecuteAsync("TYPE I")).Success)
-                        throw new FtpCommandException(reply);
-                    break;
-                default:
-                    throw new FtpException("Unsupported data type: " + type.ToString());
-            }
+			// FIX : #291 only change the data type if different
+			if (CurrentDataType == type)
+				return
+
+			//TODO:  Add cancellation support
+			FtpReply reply;
+			switch (type)
+			{
+				case FtpDataType.ASCII:
+					if (!(reply = await ExecuteAsync("TYPE A")).Success)
+						throw new FtpCommandException(reply);
+					break;
+				case FtpDataType.Binary:
+					if (!(reply = await ExecuteAsync("TYPE I")).Success)
+						throw new FtpCommandException(reply);
+					break;
+				default:
+					throw new FtpException("Unsupported data type: " + type.ToString());
+			}
 
 			CurrentDataType = type;
-        }
+		}
 #endif
 		#endregion
 
 	}
-}
+}