mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
fixed bug asking for overwriting a non existant file
This commit is contained in:
parent
0551f4f819
commit
3f9d49921d
@ -756,10 +756,10 @@ void RsCollectionDialog::download()
|
||||
mb.setText(tr("Incompatible filename."));
|
||||
mb.setInformativeText(tr("This filename is not usable on your system.")+"\n"+tr("Retroshare can replace every problematic chars by '_'.")
|
||||
+"\n"+tr("What do you want to do?"));
|
||||
QAbstractButton *btnCorrect = mb.addButton(tr("Correct filename"), QMessageBox::ResetRole);
|
||||
QAbstractButton *btnCorrectAll = mb.addButton(tr("Correct all"), QMessageBox::YesRole);
|
||||
QAbstractButton *btnSkip = mb.addButton(tr("Skip this file"), QMessageBox::ApplyRole);
|
||||
QAbstractButton *btnSkipAll = mb.addButton(tr("Skip all"), QMessageBox::AcceptRole);
|
||||
QAbstractButton *btnCorrect = mb.addButton(tr("Correct filename"), QMessageBox::YesRole);
|
||||
QAbstractButton *btnCorrectAll = mb.addButton(tr("Correct all"), QMessageBox::AcceptRole);
|
||||
QAbstractButton *btnSkip = mb.addButton(tr("Skip this file"), QMessageBox::NoRole);
|
||||
QAbstractButton *btnSkipAll = mb.addButton(tr("Skip all"), QMessageBox::RejectRole);
|
||||
mb.setIcon(QMessageBox::Question);
|
||||
mb.exec();
|
||||
|
||||
@ -833,6 +833,8 @@ bool RsCollectionDialog::openNewCollection(const RsFileTree& tree)
|
||||
|
||||
std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
|
||||
|
||||
if(QFile(fileName).exists())
|
||||
{
|
||||
QMessageBox mb;
|
||||
mb.setText(tr("Save Collection File."));
|
||||
mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
|
||||
@ -843,6 +845,7 @@ bool RsCollectionDialog::openNewCollection(const RsFileTree& tree)
|
||||
|
||||
if (mb.clickedButton()==btnCancel)
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!collection.save(fileName))
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user