branch: Fix bug 5799. Warning when opening the document settings and preferences dialogs: http://bugzilla.lyx.org/show_bug.cgi?id=5799.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28782 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiDocument.cpp

@@ -2167,8 +2167,10 @@ void GuiDocument::paramsToDialog()
 
 	pdfSupportModule->optionsLE->setText(
 		toqstr(pdf.quoted_options));
-	
-	bc().restore();
+
+	// Make sure that the bc is in the INITIAL state
+	if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))
+		bc().restore();
 }
 
 

src/frontends/qt4/GuiPrefs.cpp

@@ -2641,7 +2641,9 @@ bool GuiPreferences::initialiseParams(string const &)
 	update_screen_font_ = false;
 	
 	updateRc(rc_);
-	bc().restore();
+	// Make sure that the bc is in the INITIAL state  
+	if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))  
+		bc().restore();  
 
 	return true;
 }

status.16x

@@ -61,6 +61,9 @@ What's new
   paragraph while leaving a double space or an empty paragraph (bug 5088).
 
 - Hide the close buffer button even when the tabbar is hidden (bug 5357).
+
+- Prevent warning when opening the document settings or preferences
+  dialogs (bug 5799).
  
 
 * DOCUMENTATION AND LOCALIZATION