diff --git a/golded3/gecmfd.cpp b/golded3/gecmfd.cpp index 54c15f0..5fd7ba8 100644 --- a/golded3/gecmfd.cpp +++ b/golded3/gecmfd.cpp @@ -423,7 +423,7 @@ void CmfMsgs(GMsg* msg, bool torecycle) destarea = AL.AreaNoToId(a); } - if (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect()) + if (!torecycle && (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect())) destarea = AreaPick(pickstr, 6, &destarea); if(destarea == -1) { diff --git a/golded3/gemlst.cpp b/golded3/gemlst.cpp index eb21c5d..26e39c5 100644 --- a/golded3/gemlst.cpp +++ b/golded3/gemlst.cpp @@ -209,12 +209,9 @@ void GMsgList::ReadMlst(int n) { strcpy(ml->to, msg.To()); strcpy(ml->re, msg.re); - ml->colorby = GetColorName(ml->by, msg.orig, -1); - if(AA->isnet()) - ml->colorto = GetColorName(ml->to, msg.dest, -1); - else - { Addr a; - ml->colorto = GetColorName(ml->to, a, -1); + { Addr zero; + ml->colorby = GetColorName(ml->by, msg.orig, -1); + ml->colorto = GetColorName(ml->to, AA->isnet() ? msg.dest : zero, -1); } } diff --git a/golded3/geview.cpp b/golded3/geview.cpp index 97804ce..a52f8b3 100644 --- a/golded3/geview.cpp +++ b/golded3/geview.cpp @@ -257,8 +257,8 @@ void GMsgHeaderView::Paint() { window.prints(3, 0, window_color, LNG->To); color = ((msg->foundwhere&GFIND_TO) or msg->attr.tou()) ? highlight_color : to_color; - { Addr a; - color = GetColorName(msg->To(), area->isnet() ? msg->dest : a, color); + { Addr zero; + color = GetColorName(msg->To(), area->isnet() ? msg->dest : zero, color); } window.prints(3, CFG->disphdrnameset.pos, color, buf);