From: Pavel Sanda <sanda@lyx.org>
Date: Thu, 30 Oct 2008 13:47:41 +0000 (+0000)
Subject: Fix http://bugzilla.lyx.org/show_bug.cgi?id=5430 .
X-Git-Tag: 1.6.10~2776
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=de7c7ea3605ae51a92e9aaded2e52c22ebffc484;p=features.git

Fix http://bugzilla.lyx.org/show_bug.cgi?id=5430 .
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145723.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27197 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 7f5beea704..770706c3e5 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -132,12 +132,12 @@ void LyXVC::registrer()
 	docstring response;
 	bool ok = Alert::askForText(response, _("LyX VC: Initial description"),
 			_("(no initial description)"));
-	if (!ok || response.empty()) {
-		// should we insist on checking response.empty()?
+	if (!ok) {
 		LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
 		return;
 	}
-
+	if (response.empty())
+		response = _("(no initial description)");
 	vcs->registrer(to_utf8(response));
 }
 
diff --git a/src/frontends/alert.h b/src/frontends/alert.h
index 004a179885..b4e123731c 100644
--- a/src/frontends/alert.h
+++ b/src/frontends/alert.h
@@ -54,7 +54,10 @@ void error(docstring const & title, docstring const & message);
  */
 void information(docstring const & title, docstring const & message);
 
-/// Asks for a text. DO NOT USE !!
+/**
+ * Asks for a text. Returns true for OK. Obtained message is in response
+ * (even empty string). dflt stands for default message in the dialog.
+ */
 bool askForText(docstring & response, docstring const & msg,
 	docstring const & dflt = docstring());
 
diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index 75da5ee21e..e399835a7b 100644
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -236,7 +236,7 @@ bool askForText(docstring & response, docstring const & msg,
 		QLineEdit::Normal,
 		toqstr(dflt), &ok);
 
-	if (ok && !text.isEmpty()) {
+	if (ok) {
 		response = qstring_to_ucs4(text);
 		return true;
 	}