Don't write a \bibtex_command to the preferences file if not needed.

[features.git] / src / frontends / qt4 / GuiPrefs.cpp

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 596233bdb8f1638e8d03c2515b7bd330311106e5..818a3e2396aa0ac5243d976b2a40fc41564d02c1 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -670,19 +670,29 @@ void PrefLatex::on_latexIndexCO_activated(int n)
 
 void PrefLatex::apply(LyXRC & rc) const
 {
+       // If bibtex is not empty, bibopt contains the options, otherwise
+       // it is a customized bibtex command with options.
        QString const bibtex = latexBibtexCO->itemData(
                latexBibtexCO->currentIndex()).toString();
+       QString const bibopt = latexBibtexED->text();
        if (bibtex.isEmpty())
-               rc.bibtex_command = fromqstr(latexBibtexED->text());
+               rc.bibtex_command = fromqstr(bibopt);
+       else if (bibopt.isEmpty())
+               rc.bibtex_command = fromqstr(bibtex);
        else
-               rc.bibtex_command = fromqstr(bibtex) + " " + fromqstr(latexBibtexED->text());
+               rc.bibtex_command = fromqstr(bibtex) + " " + fromqstr(bibopt);
 
+       // If index is not empty, idxopt contains the options, otherwise
+       // it is a customized index command with options.
        QString const index = latexIndexCO->itemData(
                latexIndexCO->currentIndex()).toString();
+       QString const idxopt = latexIndexED->text();
        if (index.isEmpty())
-               rc.index_command = fromqstr(latexIndexED->text());
+               rc.index_command = fromqstr(idxopt);
+       else if (idxopt.isEmpty())
+               rc.index_command = fromqstr(index);
        else
-               rc.index_command = fromqstr(index) + " " + fromqstr(latexIndexED->text());
+               rc.index_command = fromqstr(index) + " " + fromqstr(idxopt);
 
        rc.fontenc = fromqstr(latexEncodingED->text());
        rc.chktex_command = fromqstr(latexChecktexED->text());