Fix misc CI issues

remotes/origin/0.7.0-dev
Nicolas Werner 5 years ago
parent df1da1e18f
commit c4ba832331
  1. 3
      src/timeline2/TimelineModel.h
  2. 2
      src/timeline2/TimelineViewManager.cpp
  3. 5
      src/timeline2/TimelineViewManager.h

@ -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;
};

@ -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());

@ -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);

Loading…
Cancel
Save