commit 76c15f51ea82c978f877fc106be07c418bc93a58
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Tue Sep 25 13:13:56 2018 +0200

    Do not store empty posttext for qualified citations
    
    Fixes: #11308
    (cherry picked from commit 90b13452037dba56b16f8fb55cce36aebc226804)
---
 src/frontends/qt4/GuiCitation.cpp |    2 +-
 status.23x                        |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiCitation.cpp 
b/src/frontends/qt4/GuiCitation.cpp
index 06dd4ed..4e96b74 100644
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -738,7 +738,7 @@ vector<docstring> GuiCitation::getPostTexts()
        for (int i = 0; i != selected_model_.rowCount(); ++i) {
                QStandardItem const * key = selected_model_.item(i, 1);
                QStandardItem const * post = selected_model_.item(i, 2);
-               if (key && post)
+               if (key && post && !key->text().isEmpty() && 
!post->text().isEmpty())
                        res.push_back(qstring_to_ucs4(key->text()) + " " + 
qstring_to_ucs4(post->text()));
        }
        return res;
diff --git a/status.23x b/status.23x
index 39cbc4c..979bdb8 100644
--- a/status.23x
+++ b/status.23x
@@ -124,6 +124,8 @@ What's new
 
 - Fix crash on Windows when closing external viewers (bug 11210).
 
+- Fix issue with erroneous qualified citations (bug 11308).
+
 
 
 * USER INTERFACE

Reply via email to