squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-21 07:57:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make settings file recovery more robust

Browse Source 
We should not blindly remove the leftover settings file, as the following write()
operation could fail and the user would lost all settings.
We should try renaming it instead.
This commit is contained in:
Chocobo1
2018-04-23 01:53:48 +08:00
committed by sledgehammer999
parent 7d9c282db9
commit 0ede11a1b7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/base/settingsstorage.cpp
View File

@@ -241,8 +241,12 @@ QVariantHash TransactionalSettings::read()
.arg(Utils::Fs::toNativePath(newPath)) .arg(Utils::Fs::toNativePath(newPath))
, Log::WARNING); , Log::WARNING);
Utils::Fs::forceRemove(newPath); QString finalPath = newPath;
write(res); int index = finalPath.lastIndexOf("_new", -1, Qt::CaseInsensitive);
finalPath.remove(index, 4);
Utils::Fs::forceRemove(finalPath);
QFile::rename(newPath, finalPath);
} }
else { else {
deserialize(m_name, res); deserialize(m_name, res);