From 840d5eb6713561be2d87168d79d86dfcab20eb6f Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 16 Feb 2015 17:52:37 +0300 Subject: [PATCH] fixed Save As default filenames --- Telegram/SourceFiles/history.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 9a32293303..5774a00d1c 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -496,8 +496,9 @@ void VideoSaveLink::doSave(bool forceSavingAs) const { psOpenFile(already, true); } } else { - QDir alreadyDir(already.isEmpty() ? QDir() : QFileInfo(already).dir()); - QString name = already.isEmpty() ? QString(".mov") : already; + QFileInfo alreadyInfo(already); + QDir alreadyDir(already.isEmpty() ? QDir() : alreadyInfo.dir()); + QString name = already.isEmpty() ? QString(".mov") : alreadyInfo.fileName(); QString filename = saveFileName(lang(lng_save_video), qsl("MOV Video (*.mov);;All files (*.*)"), qsl("video"), name, forceSavingAs, alreadyDir); if (!filename.isEmpty()) { if (forceSavingAs) { @@ -587,9 +588,10 @@ void AudioSaveLink::doSave(bool forceSavingAs) const { psOpenFile(already, true); } } else { - QDir alreadyDir(already.isEmpty() ? QDir() : QFileInfo(already).dir()); + QFileInfo alreadyInfo(already); + QDir alreadyDir(already.isEmpty() ? QDir() : alreadyInfo.dir()); bool mp3 = (data->mime == QLatin1String("audio/mp3")); - QString name = already.isEmpty() ? (mp3 ? qsl(".mp3") : qsl(".ogg")) : already; + QString name = already.isEmpty() ? (mp3 ? qsl(".mp3") : qsl(".ogg")) : alreadyInfo.fileName(); QString filename = saveFileName(lang(lng_save_audio), mp3 ? qsl("MP3 Audio (*.mp3);;All files (*.*)") : qsl("OGG Opus Audio (*.ogg);;All files (*.*)"), qsl("audio"), name, forceSavingAs, alreadyDir); if (!filename.isEmpty()) { if (forceSavingAs) { @@ -692,8 +694,9 @@ void DocumentSaveLink::doSave(bool forceSavingAs) const { psOpenFile(already, true); } } else { - QDir alreadyDir(already.isEmpty() ? QDir() : QFileInfo(already).dir()); - QString name = already.isEmpty() ? data->name : already, filter; + QFileInfo alreadyInfo(already); + QDir alreadyDir(already.isEmpty() ? QDir() : alreadyInfo.dir()); + QString name = already.isEmpty() ? data->name : alreadyInfo.fileName(), filter; MimeType mimeType = mimeTypeForName(data->mime); QStringList p = mimeType.globPatterns(); QString pattern = p.isEmpty() ? QString() : p.front();