pull/416/head
Loren Burkholder 3 years ago
parent dcdf00dcc5
commit a23c586cde
  1. 5
      src/UserSettingsPage.cpp
  2. 7
      src/timeline/TimelineModel.cpp

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

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

Loading…
Cancel
Save