From ddfb49a4f0fa78e00c91fc3de1a8d9861744d8df Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 10 Jan 2010 21:18:41 +0000 Subject: [PATCH] Part of r32942. We want to avoid reload flickering when user canceled commiting dialog. http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg156936.html git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32956 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LyXVC.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 4ead9126f5..b35f6aef55 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -160,13 +160,18 @@ bool LyXVC::registrer() string LyXVC::checkIn() { LYXERR(Debug::LYXVC, "LyXVC: checkIn"); + docstring empty(_("(no log message)")); docstring response; string log; bool ok = Alert::askForText(response, _("LyX VC: Log Message")); if (ok) { if (response.empty()) - response = _("(no log message)"); + response = empty; log = vcs->checkIn(to_utf8(response)); + + // Reserve empty string for cancel button + if (log.empty()) + log = to_utf8(empty); } else { LYXERR(Debug::LYXVC, "LyXVC: user cancelled"); }