mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Fixed duplicate save file dialog

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/structs.cpp
View File

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