mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-21 07:57:22 -06:00
Make settings file recovery more robust
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:
committed by
sledgehammer999
parent
7d9c282db9
commit
0ede11a1b7
@@ -241,8 +241,12 @@ QVariantHash TransactionalSettings::read()
|
||||
.arg(Utils::Fs::toNativePath(newPath))
|
||||
, Log::WARNING);
|
||||
|
||||
Utils::Fs::forceRemove(newPath);
|
||||
write(res);
|
||||
QString finalPath = newPath;
|
||||
int index = finalPath.lastIndexOf("_new", -1, Qt::CaseInsensitive);
|
||||
finalPath.remove(index, 4);
|
||||
|
||||
Utils::Fs::forceRemove(finalPath);
|
||||
QFile::rename(newPath, finalPath);
|
||||
}
|
||||
else {
|
||||
deserialize(m_name, res);
|
||||
|
||||
Reference in New Issue
Block a user