diff options
| author |  Fabio Bas | 2009-12-21 12:28:55 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-12-21 12:28:55 +0000 |
| commit | 18addfe1a0e37c6f9bace3ab27610590059f672f (patch) | |
| tree | 4d9b35a0daf5eb5316e93c2cf323df6a75a7c8f5 /src/modules/dcc/broker.cpp | |
| parent | fix for #657 (diff) | |
| download | KVIrc-18addfe1a0e37c6f9bace3ab27610590059f672f.tar.gz KVIrc-18addfe1a0e37c6f9bace3ab27610590059f672f.tar.bz2 KVIrc-18addfe1a0e37c6f9bace3ab27610590059f672f.zip | |
patch for #656
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3726 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/broker.cpp')
| -rw-r--r-- | src/modules/dcc/broker.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index e72773727..a4b741d19 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -669,7 +669,9 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) if(KVI_OPTION_BOOL(KviOption_boolSortReceivedByDccFilesByNicks)) { KviQString::ensureLastCharIs(dcc->szLocalFileName,KVI_PATH_SEPARATOR_CHAR); - dcc->szLocalFileName.append(dcc->szNick); + QString cleanNick = dcc->szNick; + KviFileUtils::cleanFileName(cleanNick); + dcc->szLocalFileName.append(cleanNick); KviFileUtils::adjustFilePath(dcc->szLocalFileName); } KviFileUtils::makeDir(dcc->szLocalFileName); @@ -684,7 +686,9 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) if(KVI_OPTION_BOOL(KviOption_boolSortReceivedByDccFilesByNicks)) { KviQString::ensureLastCharIs(dcc->szLocalFileName,KVI_PATH_SEPARATOR_CHAR); - dcc->szLocalFileName.append(dcc->szNick); + QString cleanNick = dcc->szNick; + KviFileUtils::cleanFileName(cleanNick); + dcc->szLocalFileName.append(cleanNick); KviFileUtils::adjustFilePath(dcc->szLocalFileName); KviFileUtils::makeDir(dcc->szLocalFileName); } @@ -695,7 +699,9 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) if(!(dcc->bAutoAccept)) { - dcc->szLocalFileName+=dcc->szFileName; + QString cleanFilename = dcc->szFileName; + KviFileUtils::cleanFileName(cleanFilename); + dcc->szLocalFileName.append(cleanFilename); if(KviFileDialog::askForSaveFileName(dcc->szLocalFileName, __tr2qs_ctx("Choose Files to Save - KVIrc","dcc"),dcc->szLocalFileName)) { @@ -706,7 +712,9 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) } else { // auto accept // WE choose the filename - dcc->szLocalFileName.append(dcc->szFileName); + QString cleanFilename = dcc->szFileName; + KviFileUtils::cleanFileName(cleanFilename); + dcc->szLocalFileName.append(cleanFilename); if(_OUTPUT_VERBOSE) { |