summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
authorHubert Terlecki <bialypl@gmail.com>2016-06-15 15:45:50 +0200
committerPatrick Griffis <tingping@tingping.se>2016-06-30 08:45:01 -0400
commit77dccacd0215aa51edf755886d39d94ed30b03af (patch)
treeabdc396b75274956ee4f5036c2c493f75c5b63b9 /src/common
parent0667519d1737c61561c3edc34536a70345901969 (diff)
dcc: Fix resuming with DCC GET
Fixes #1746
Closes #1747
Diffstat (limited to 'src/common')
-rw-r--r--src/common/dcc.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/common/dcc.c b/src/common/dcc.c
index 02cbeb00..dc5ec2fe 100644
--- a/src/common/dcc.c
+++ b/src/common/dcc.c
@@ -2212,10 +2212,17 @@ dcc_get_nick (struct session *sess, char *nick)
 		{
 			if (dcc->dccstat == STAT_QUEUED && dcc->type == TYPE_RECV)
 			{
-				dcc->resumable = 0;
-				dcc->pos = 0;
-				dcc->ack = 0;
-				dcc_connect (dcc);
+				update_is_resumable (dcc);
+				if (prefs.hex_dcc_auto_resume && dcc->resumable)
+				{
+					dcc_resume (dcc);
+				}
+				else
+				{
+					dcc->pos = 0;
+					dcc->ack = 0;
+					dcc_connect (dcc);
+				}
 				return;
 			}
 		}