d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 06:08:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make lint

Browse source
This commit is contained in:
Loren Burkholder 2021-08-31 17:58:00 -04:00
parent dcdf00dcc5
commit a23c586cde
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/UserSettingsPage.cpp
View file

@ -812,9 +812,8 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
if (JdenticonProvider::isAvailable()) { if (JdenticonProvider::isAvailable()) {
useIdenticon_ = new Toggle{this}; useIdenticon_ = new Toggle{this};
useIdenticon_->setChecked(settings_->useIdenticon()); useIdenticon_->setChecked(settings_->useIdenticon());
} } else
else useIdenticon_ = nullptr;
useIdenticon_ = nullptr;
if (!settings_->tray()) { if (!settings_->tray()) {
startInTrayToggle_->setState(false); startInTrayToggle_->setState(false);

7
src/timeline/TimelineModel.cpp
View file

@ -818,10 +818,9 @@ TimelineModel::syncState(const mtx::responses::State &s)
emit roomNameChanged(); emit roomNameChanged();
emit roomMemberCountChanged(); emit roomMemberCountChanged();
if (roomMemberCount() <= 2) if (roomMemberCount() <= 2) {
{ emit isDirectChanged();
emit isDirectChanged(); emit directChatAvatarMxidChanged();
emit directChatAvatarMxidChanged();
} }
} else if (std::holds_alternative<StateEvent<state::Encryption>>(e)) { } else if (std::holds_alternative<StateEvent<state::Encryption>>(e)) {
this->isEncrypted_ = cache::isRoomEncrypted(room_id_.toStdString()); this->isEncrypted_ = cache::isRoomEncrypted(room_id_.toStdString());