From 819675bab2f39571b2300088f8d41ee716352a71 Mon Sep 17 00:00:00 2001 From: Ianos Gnatiuc Date: Sun, 15 Jan 2006 09:06:36 +0000 Subject: [PATCH] Fixed marks and lastread pointers for move command --- docs/notework.txt | 4 ++++ golded3/gecmfd.cpp | 17 +++-------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/docs/notework.txt b/docs/notework.txt index e4deba7..7771455 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -10,6 +10,10 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ +- Fixed marks and lastread pointers for move command. + +- Win9x: Fixed waiting for key pressing before area scanning. + = Snapshot for the January 14, 2006. - Prevent crash of golded while formatting status line. diff --git a/golded3/gecmfd.cpp b/golded3/gecmfd.cpp index 55530f1..d8cbcae 100644 --- a/golded3/gecmfd.cpp +++ b/golded3/gecmfd.cpp @@ -635,7 +635,7 @@ void CmfMsgs(GMsg* msg, bool torecycle) // Delete original msg if moved if(mode == MODE_MOVE) { msg->msgno = msgno; - AA->DeleteMsg(msg, DIR_PREV); + AA->DeleteMsg(msg, torecycle ? reader_direction : DIR_PREV); AA->PMrk.Del(msg->msgno); } @@ -660,16 +660,11 @@ void CmfMsgs(GMsg* msg, bool torecycle) else LoadCharset("N/A", "N/A"); - if(do_mode == MODE_MARKED) { + if(do_mode == MODE_MARKED) + { if(cmf == MODE_MOVE) AA->Mark.ResetAll(); } - else { - if(cmf == MODE_MOVE) { - AA->Mark.Del(msg->msgno); - AA->PMrk.Del(msg->msgno); - } - } w_info(NULL); @@ -681,15 +676,9 @@ void CmfMsgs(GMsg* msg, bool torecycle) void CopyMoveForward(bool torecycle) { - uint lastread = reader_msg->msgno; - - AA->set_lastread(AA->Msgn.ToReln(lastread, AA->lastread())); - AA->attr().hex0(); if(AA->Msgn.Count()) CmfMsgs(reader_msg, torecycle); - - AA->set_lastread(AA->Msgn.ToReln(lastread, AA->lastread())); }