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

Fixed settings reset in case of tiled background.

This commit is contained in:
John Preston 2016-09-15 13:26:31 +03:00
parent 3423bd69dc
commit 96202f775c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/localstorage.cpp
View File

@ -581,6 +581,7 @@ namespace {
FileKey _backgroundKey = 0; FileKey _backgroundKey = 0;
bool _backgroundWasRead = false; bool _backgroundWasRead = false;
bool _readingUserSettings = false;
FileKey _userSettingsKey = 0; FileKey _userSettingsKey = 0;
FileKey _recentHashtagsAndBotsKey = 0; FileKey _recentHashtagsAndBotsKey = 0;
bool _recentHashtagsAndBotsWereRead = false; bool _recentHashtagsAndBotsWereRead = false;
@ -1548,6 +1549,12 @@ namespace {
} }
void _writeUserSettings() { void _writeUserSettings() {
if (_readingUserSettings) {
LOG(("App Error: attempt to write settings while reading them!"));
return;
}
LOG(("App Info: writing encrypted user settings..."));
if (!_userSettingsKey) { if (!_userSettingsKey) {
_userSettingsKey = genKey(); _userSettingsKey = genKey();
_mapChanged = true; _mapChanged = true;
@ -1622,22 +1629,28 @@ namespace {
void _readUserSettings() { void _readUserSettings() {
FileReadDescriptor userSettings; FileReadDescriptor userSettings;
if (!readEncryptedFile(userSettings, _userSettingsKey)) { if (!readEncryptedFile(userSettings, _userSettingsKey)) {
LOG(("App Info: could not read encrypted user settings..."));
_readOldUserSettings(); _readOldUserSettings();
return _writeUserSettings(); return _writeUserSettings();
} }
LOG(("App Info: reading encrypted user settings...")); LOG(("App Info: reading encrypted user settings..."));
_readingUserSettings = true;
while (!userSettings.stream.atEnd()) { while (!userSettings.stream.atEnd()) {
quint32 blockId; quint32 blockId;
userSettings.stream >> blockId; userSettings.stream >> blockId;
if (!_checkStreamStatus(userSettings.stream)) { if (!_checkStreamStatus(userSettings.stream)) {
_readingUserSettings = false;
return _writeUserSettings(); return _writeUserSettings();
} }
if (!_readSetting(blockId, userSettings.stream, userSettings.version)) { if (!_readSetting(blockId, userSettings.stream, userSettings.version)) {
_readingUserSettings = false;
return _writeUserSettings(); return _writeUserSettings();
} }
} }
_readingUserSettings = false;
LOG(("App Info: encrypted user settings read."));
} }
void _writeMtpData() { void _writeMtpData() {