upported fix for dcc resend to trunk

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2091 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 17 insertions, 21 deletions

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index c1322fee7..ab120d2f1 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -160,7 +160,6 @@ void KviDccBroker::rsendAskForFileName(KviDccDescriptor * dcc)
 			if(filenames.count() > 0)
 			{
 				KviDccDescriptor * d;
-				KviDccDescriptor * templ = dcc;
 				QStringList::Iterator it=filenames.begin();
 				while(it != filenames.end())
 				{
@@ -773,28 +772,25 @@ void KviDccBroker::recvFileExecute(KviDccBox *box,KviDccDescriptor * dcc)
 void KviDccBroker::sendFileManage(KviDccDescriptor * dcc)
 {
 	QStringList filenames;
-	if(
-		KviFileDialog::askForOpenFileNames(filenames,
-		__tr2qs_ctx("Choose Files to Send - KVIrc","dcc"),"")
-		) {
-			if(filenames.count() > 0)
+	if(KviFileDialog::askForOpenFileNames(filenames,__tr2qs_ctx("Choose Files to Send - KVIrc","dcc"),""))
+	{
+		if(filenames.count() > 0)
+		{
+			KviDccDescriptor * d;
+			QStringList::Iterator it=filenames.begin();
+			while(it != filenames.end())
 			{
-				KviDccDescriptor * d;
-				KviDccDescriptor * templ = dcc;
-				QStringList::Iterator it=filenames.begin();
-				while(it != filenames.end())
-				{
-					d = new KviDccDescriptor(*dcc);
-					d->szLocalFileName = *(it);
-					d->szLocalFileName.trimmed();
-					++it;
-					if(d->szLocalFileName.isEmpty())
-						cancelDcc(d);
-					else
-						sendFileExecute(0,d);
-				}
-				delete dcc;
+				d = new KviDccDescriptor(*dcc);
+				d->szLocalFileName = *(it);
+				d->szLocalFileName.trimmed();
+				++it;
+				if(d->szLocalFileName.isEmpty())
+					cancelDcc(d);
+				else
+					sendFileExecute(0,d);
 			}
+			delete dcc;
+		}
 	} else {
 		cancelDcc(dcc);
 	}