procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix saving a loaded file as another existing file.

This commit is contained in:
John Preston 2017-08-01 20:17:59 +03:00
parent 27151d5e25
commit 91f0d049db
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/mediaview.cpp
View File

@ -783,6 +783,7 @@ void MediaView::onSaveAs() {
psShowOverAll(this); psShowOverAll(this);
if (!file.isEmpty() && file != location.name()) { if (!file.isEmpty() && file != location.name()) {
if (_doc->data().isEmpty()) { if (_doc->data().isEmpty()) {
QFile(file).remove();
QFile(location.name()).copy(file); QFile(location.name()).copy(file);
} else { } else {
QFile f(file); QFile f(file);
@ -900,8 +901,11 @@ void MediaView::onDownload() {
if (location.accessEnable()) { if (location.accessEnable()) {
if (!QDir().exists(path)) QDir().mkpath(path); if (!QDir().exists(path)) QDir().mkpath(path);
toName = filedialogNextFilename(_doc->name, location.name(), path); toName = filedialogNextFilename(_doc->name, location.name(), path);
if (toName != location.name() && !QFile(location.name()).copy(toName)) { if (!toName.isEmpty() && toName != location.name()) {
toName = QString(); QFile(toName).remove();
if (!QFile(location.name()).copy(toName)) {
toName = QString();
}
} }
location.accessDisable(); location.accessDisable();
} else { } else {

1
Telegram/SourceFiles/structs.cpp
View File

@ -1889,6 +1889,7 @@ void DocumentData::save(const QString &toFile, ActionOnLoad action, const FullMs
} else if (l.accessEnable()) { } else if (l.accessEnable()) {
auto alreadyName = l.name(); auto alreadyName = l.name();
if (alreadyName != toFile) { if (alreadyName != toFile) {
QFile(toFile).remove();
QFile(alreadyName).copy(toFile); QFile(alreadyName).copy(toFile);
} }
l.accessDisable(); l.accessDisable();