From 98373720af88efa8a934d29ccdb9ac5fbaf22f4d Mon Sep 17 00:00:00 2001 From: Ianos Gnatiuc Date: Wed, 7 Jun 2006 04:18:52 +0000 Subject: [PATCH] Turn on flag 'Locked' if TimeOutSaveMsg is enabled. --- docs/notework.rus | 1 + docs/notework.txt | 2 ++ golded3/geedit2.cpp | 19 ++++++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/notework.rus b/docs/notework.rus index f1ca157..656b960 100644 --- a/docs/notework.rus +++ b/docs/notework.rus @@ -10,6 +10,7 @@ _____________________________________________________________________________ Заметки для GoldED+ 1.1.5, /snapshot/ _____________________________________________________________________________ ++ Если TimeOutSaveMsg включен, то сообщение сохранится с флагом 'Locked'. - Дополнительная проверка токена ST_EDITSTATUS. - Исправлена ошибка приводящая к вечному циклу, если фаил для токена @random не был найден. diff --git a/docs/notework.txt b/docs/notework.txt index 85287dd..af32fed 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -10,6 +10,8 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ ++ Turn on flag 'Locked' if TimeOutSaveMsg is enabled. + - Additional check of token ST_EDITSTATUS. - Fixed infinite loop when parsing template, if @random token file diff --git a/golded3/geedit2.cpp b/golded3/geedit2.cpp index 7a06081..17055f4 100644 --- a/golded3/geedit2.cpp +++ b/golded3/geedit2.cpp @@ -1955,12 +1955,22 @@ void IEclass::AskExit() { // ------------------------------------------------------------------ -void IEclass::QuitNow() { - +void IEclass::QuitNow() +{ GFTRK("EditQuitNow"); - quitnow = CFG->switches.get(timeoutsavemsg) ? NO : YES; - done = CFG->switches.get(timeoutsavemsg) ? MODE_SAVE : MODE_QUIT; + if (CFG->switches.get(timeoutsavemsg)) + { + quitnow = NO; + done = MODE_SAVE; + msgptr->attr.lok1(); + } + else + { + quitnow = YES; + done = MODE_QUIT; + } + gkbd.quitall = YES; GFTRK(0); @@ -1977,4 +1987,3 @@ int EditMsg(int __mode, uint* __position, GMsg* __msg) { // ------------------------------------------------------------------ -