Stop fetching notifications at the end

2 files changed, 7 insertions, 2 deletions

diff --git a/src/Body.cpp b/src/Body.cpp
index 5a23694..9b6a5d8 100644
--- a/src/Body.cpp
+++ b/src/Body.cpp
@@ -280,8 +280,10 @@ namespace QuickMedia {
     void Body::select_first_item() {
         selected_scrolled = 0.0f;
         selected_item = 0;
-        prev_selected_item = selected_item;
-        page_scroll = 0.0f;
+        if(attach_side == AttachSide::TOP) {
+            prev_selected_item = selected_item;
+            page_scroll = 0.0f;
+        }
         clamp_selection();
         clamp_selected_item_to_body_count = 1;
         //item_background_target_pos_y = body_pos.y;
diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 7992772..49a3988 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -1476,6 +1476,8 @@ namespace QuickMedia {
         const rapidjson::Value &next_token_json = GetMember(json_root, "next_token");
         if(next_token_json.IsString())
             set_next_notifications_token(next_token_json.GetString());
+        else
+            set_next_notifications_token("invalid");
 
         return PluginResult::OK;
     }
@@ -2782,6 +2784,7 @@ namespace QuickMedia {
 
         const rapidjson::Value &end_json = GetMember(json_root, "end");
         if(!end_json.IsString()) {
+            room_data->set_prev_batch("invalid");
             fprintf(stderr, "Warning: matrix messages response is missing 'end', this could happen if we received the very first messages in the room\n");
             return PluginResult::OK;
         }