From: Richard Heck <rgheck@comcast.net>
Date: Wed, 24 Mar 2010 14:34:05 +0000 (+0000)
Subject: Only restore the last applied style on initialization.
X-Git-Tag: 2.0.0~3716
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a02114dceab80e2870104a016d22b90a38434e48;p=features.git

Only restore the last applied style on initialization.


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

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index c54a5f2128..f485a6842d 100644
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -248,12 +248,6 @@ void GuiCitation::updateStyle()
 	vector<CiteStyle>::const_iterator cit =
 		std::find(styles.begin(), styles.end(), cs.style);
 
-	// restore the latest natbib style
-	if (style_ >= 0 && style_ < citationStyleCO->count())
-		citationStyleCO->setCurrentIndex(style_);
-	else
-		citationStyleCO->setCurrentIndex(0);
-
 	if (cit != styles.end()) {
 		int const i = int(cit - styles.begin());
 		citationStyleCO->setCurrentIndex(i);
@@ -531,6 +525,11 @@ void GuiCitation::init()
 	fillFields(bi);
 	fillEntries(bi);
 	updateControls(bi);
+	// restore the last used natbib style
+	if (style_ >= 0 && style_ < citationStyleCO->count())
+		citationStyleCO->setCurrentIndex(style_);
+	else
+		citationStyleCO->setCurrentIndex(0);
 }