Fixed duplicate save file dialog

This commit is contained in:
John Preston 2016-03-26 11:13:57 +03:00
parent 1b5905dc54
commit 96e1f8e7cd
1 changed files with 2 additions and 2 deletions

View File

@ -951,7 +951,7 @@ void GifOpenLink::onClick(Qt::MouseButton button) const {
void DocumentSaveLink::doSave(DocumentData *data, bool forceSavingAs) {
if (!data->date) return;
QString filepath = data->filepath(DocumentData::FilePathResolveSaveFromData, forceSavingAs);
QString filepath = data->filepath(DocumentData::FilePathResolveSaveFromDataSilent, forceSavingAs);
if (!filepath.isEmpty() && !forceSavingAs) {
QPoint pos(QCursor::pos());
if (!psShowOpenWithMenu(pos.x(), pos.y(), filepath)) {
@ -1376,7 +1376,7 @@ QString DocumentData::filepath(FilePathResolveType type, bool forceSavingAs) con
if (saveFromData) {
if (type != FilePathResolveSaveFromData && type != FilePathResolveSaveFromDataSilent) {
saveFromData = false;
} else if (type == FilePathResolveSaveFromDataSilent && cAskDownloadPath()) {
} else if (type == FilePathResolveSaveFromDataSilent && (cAskDownloadPath() || forceSavingAs)) {
saveFromData = false;
}
}