summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Braun2010-10-05 20:41:14 +0200
committerSebastien Braun2010-10-05 22:12:28 +0200
commitc1a95b58a2045bf4fdbe0ae7d8186e5d04309622 (patch)
tree1c9a23385a149082e6a3a21dbdd723155085ddac
parentFix SIGSEGV when address info cannot be parsed. (diff)
downloadpvs-c1a95b58a2045bf4fdbe0ae7d8186e5d04309622.tar.gz
pvs-c1a95b58a2045bf4fdbe0ae7d8186e5d04309622.tar.xz
pvs-c1a95b58a2045bf4fdbe0ae7d8186e5d04309622.zip
Delete received file when user cancels rename.
-rw-r--r--src/gui/clientFileReceiveDialog.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/clientFileReceiveDialog.cpp b/src/gui/clientFileReceiveDialog.cpp
index e457d23..fc6a1a3 100644
--- a/src/gui/clientFileReceiveDialog.cpp
+++ b/src/gui/clientFileReceiveDialog.cpp
@@ -231,9 +231,16 @@ void ClientFileReceiveDialog::mcastTransferFinished(qulonglong transferID)
QString filename = QFileDialog::getSaveFileName(this, tr("Where should I save %1?").arg(_filename), _filename);
QFile* file = new QFile(_filename);
- if(!file->rename(filename))
+ if(filename.isNull() || filename.isEmpty())
{
- QMessageBox::warning(this, tr("Could not rename file"), tr("Failed to rename %1 to %2").arg(_filename).arg(filename));
+ file->remove();
+ }
+ else
+ {
+ if(!file->rename(filename))
+ {
+ QMessageBox::warning(this, tr("Could not rename file"), tr("Failed to rename %1 to %2").arg(_filename).arg(filename));
+ }
}
accept();
deleteLater();