Merge dee0115daf into bca05d38c4

src/Cache.cpp

@@ -42,6 +42,7 @@
 #include "UserSettingsPage.h"
 #include "Utils.h"
 #include "encryption/Olm.h"
+#include <typeinfo>
 
 //! Should be changed when a breaking change occurs in the cache format.
 //! This will reset client's data.
@@ -2440,7 +2441,13 @@ try {
                   }
 
                   auto j = nlohmann::json(event);
+                  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);
     }