Skip to content

Fixed an Error that came up with my Instance #1471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed an Error that came up with my Instance #1471

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5d5d1c
Fixed error where an invalid event would cause the entire application…
skyethepinkcat May 30, 2023
7fb8fac
Made style consistent with clang-format
skyethepinkcat May 30, 2023
dee0115
Merge branch 'Nheko-Reborn:master' into master
skyethepinkcat Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "UserSettingsPage.h"
#include "Utils.h"
#include "encryption/Olm.h"
#include <typeinfo>
Copy link
Member

@deepbluev7 deepbluev7 Jun 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This include seems unnecessary?


//! Should be changed when a breaking change occurs in the cache format.
//! This will reset client's data.
Expand Down Expand Up @@ -1876,7 +1877,13 @@ Cache::saveState(const mtx::responses::Sync &res)
}

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);
}
Expand Down