# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1300111440 -3600
# Node ID fad27c72a229516a539b04ef09bd7d20149d0465
# Parent  256cfc706ae54ecd8d37557673bbd534f3d7540d
Don't update readmark when buffer scroll_lock is set

diff -r 256cfc706ae5 -r fad27c72a229 mcabber/mcabber/screen.c
--- a/mcabber/mcabber/screen.c	Mon Mar 14 14:25:21 2011 +0100
+++ b/mcabber/mcabber/screen.c	Mon Mar 14 15:04:00 2011 +0100
@@ -1474,9 +1474,10 @@
   if (!dont_show) {
     if (win_entry->bd->lock)
       setmsgflg = TRUE;
-    // If this is an outgoing message, update readmark
-    if (!special && (prefix_flags & (HBB_PREFIX_OUT|HBB_PREFIX_HLIGHT_OUT)))
-      hbuf_set_readmark(win_entry->bd->hbuf, FALSE);
+    else
+      // If this is an outgoing message, update readmark
+      if (!special && (prefix_flags & (HBB_PREFIX_OUT|HBB_PREFIX_HLIGHT_OUT)))
+        hbuf_set_readmark(win_entry->bd->hbuf, FALSE);
     // Show and refresh the window
     top_panel(win_entry->panel);
     scr_update_window(win_entry);
@@ -2820,7 +2821,8 @@
   win_entry = scr_search_window(CURRENT_JID, isspe);
   if (!win_entry) return;
 
-  hbuf_set_readmark(win_entry->bd->hbuf, action);
+  if (!win_entry->bd->lock)
+    hbuf_set_readmark(win_entry->bd->hbuf, action);
 }