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

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 4ead9126f535088d93afa4190db9c937036b93cb..b35f6aef5572d78745298a3b1d3a0215c46b40a5 100644 (file)
--- 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");
        }