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

Fix misc CI issues

Browse source
This commit is contained in:
Nicolas Werner 2019-09-03 08:23:07 +02:00
parent df1da1e18f
commit c4ba832331
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/timeline2/TimelineModel.h
View file

@ -112,9 +112,8 @@ private:
QString room_id_;
QString prev_batch_token_;
bool isInitialSync = true;
bool isInitialSync = true;
bool paginationInProgress = false;
QHash<QString, QColor> userColors;
};

2
src/timeline2/TimelineViewManager.cpp
View file

@ -44,7 +44,7 @@ TimelineViewManager::setHistoryView(const QString &room_id)
auto room = models.find(room_id);
if (room != models.end()) {
timeline_ = room.value().get();
timeline_ = room.value().data();
timeline_->fetchHistory();
emit activeTimelineChanged(timeline_);
nhlog::ui()->info("Activated room {}", room_id.toStdString());

5
src/timeline2/TimelineViewManager.h
View file

@ -32,10 +32,7 @@ public:
void sync(const mtx::responses::Rooms &rooms) {}
void clearAll() { models.clear(); }
Q_INVOKABLE TimelineModel *activeTimeline() const
{
return timeline_;
}
Q_INVOKABLE TimelineModel *activeTimeline() const { return timeline_; }
signals:
void clearRoomMessageCount(QString roomid);