From: Richard Heck <rgheck@lyx.org>
Date: Sat, 10 Nov 2012 02:04:10 +0000 (-0500)
Subject: Restore fix for constant resetting of View>Source widget (bug #8411).
X-Git-Tag: 2.0.6~244
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c920318f42599a182ae639b36e2fdf1c2fcc658e;p=features.git

Restore fix for constant resetting of View>Source widget (bug #8411).
---

diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
index 83114eb7f2..53a63ad4ae 100644
--- a/src/frontends/qt4/GuiViewSource.cpp
+++ b/src/frontends/qt4/GuiViewSource.cpp
@@ -197,6 +197,7 @@ void ViewSourceWidget::updateDefaultFormat()
 	outputFormatCO->addItem(qt_("Default"),
 				QVariant(QString("default")));
 
+	int index = 0;
 	vector<string> tmp = bv_->buffer().params().backends();
 	vector<string>::const_iterator it = tmp.begin();
 	vector<string>::const_iterator en = tmp.end();
@@ -206,12 +207,15 @@ void ViewSourceWidget::updateDefaultFormat()
 		if (!fmt) {
 			LYXERR0("Can't find format for backend " << format << "!");
 			continue;
-		}
+		} 
 
-		QString const pretty =
-			fmt ? qt_(fmt->prettyname()) : toqstr(format);
-		outputFormatCO->addItem(pretty, QVariant(toqstr(format)));
+		QString const pretty = qt_(fmt->prettyname());
+		QString const qformat = toqstr(format);
+		outputFormatCO->addItem(pretty, QVariant(qformat));
+		if (qformat == view_format_)
+		   index = outputFormatCO->count() -1;
 	}
+	outputFormatCO->setCurrentIndex(index);
 
 	outputFormatCO->blockSignals(false);
 }
diff --git a/status.20x b/status.20x
index 01f9fcd700..9993101c84 100644
--- a/status.20x
+++ b/status.20x
@@ -58,6 +58,9 @@ What's new
 
 * USER INTERFACE
 
+- Fix regression in which clicking in the main work area always resets
+  the selected format in View>Source (bug #8411).
+  
 - When selecting text and Insert > Preview, immediately display the
   preview (bug #8075).