mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-27 13:38:49 +03:00
Merge dee0115daf
into 048af42780
This commit is contained in:
commit
fe68854dd1
1 changed files with 8 additions and 1 deletions
|
@ -36,6 +36,7 @@
|
||||||
#include "UserSettingsPage.h"
|
#include "UserSettingsPage.h"
|
||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
#include "encryption/Olm.h"
|
#include "encryption/Olm.h"
|
||||||
|
#include <typeinfo>
|
||||||
|
|
||||||
//! Should be changed when a breaking change occurs in the cache format.
|
//! Should be changed when a breaking change occurs in the cache format.
|
||||||
//! This will reset client's data.
|
//! This will reset client's data.
|
||||||
|
@ -2290,7 +2291,13 @@ try {
|
||||||
}
|
}
|
||||||
|
|
||||||
auto j = nlohmann::json(event);
|
auto j = nlohmann::json(event);
|
||||||
accountDataDb.put(txn, j["type"].get<std::string>(), j.dump());
|
try {
|
||||||
|
accountDataDb.put(txn, j["type"].get<std::string>(), j.dump());
|
||||||
|
} catch (const lmdb::error &e) {
|
||||||
|
nhlog::db()->warn("failed to save state after sync: {}, skipping event",
|
||||||
|
e.what());
|
||||||
|
return;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
ev);
|
ev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue