rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 room_id_;
QString prev_batch_token_; QString prev_batch_token_;
bool isInitialSync = true; bool isInitialSync = true;
bool paginationInProgress = false; bool paginationInProgress = false;
QHash<QString, QColor> userColors; 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); auto room = models.find(room_id);
if (room != models.end()) { if (room != models.end()) {
timeline_ = room.value().get(); timeline_ = room.value().data();
timeline_->fetchHistory(); timeline_->fetchHistory();
emit activeTimelineChanged(timeline_); emit activeTimelineChanged(timeline_);
nhlog::ui()->info("Activated room {}", room_id.toStdString()); 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 sync(const mtx::responses::Rooms &rooms) {}
void clearAll() { models.clear(); } void clearAll() { models.clear(); }
Q_INVOKABLE TimelineModel *activeTimeline() const Q_INVOKABLE TimelineModel *activeTimeline() const { return timeline_; }
{
return timeline_;
}
signals: signals:
void clearRoomMessageCount(QString roomid); void clearRoomMessageCount(QString roomid);