Merge branch 'master' of git.lyx.org:lyx

[features.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 07ffef1f11e3cbcf1f21e02a2ea335ce29ec4108..c95cacd606636dc868a4af52865eee2b57bf0a63 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -55,7 +55,9 @@ namespace os = support::os;
 
 namespace {
 
-static unsigned int const LYXRC_FILEFORMAT = 14; // spitz: default_otf_view_format
+// The format should also be updated in configure.py, and conversion code
+// should be added to prefs2prefs_prefs.py.
+static unsigned int const LYXRC_FILEFORMAT = 15; // prannoy: statusbar on/off in full screen
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -2827,8 +2829,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                        break;
        }
        case RC_DEFAULT_OTF_VIEW_FORMAT:
-               if (ignore_system_lyxrc ||
-                   default_otf_view_format != system_lyxrc.default_otf_view_format) {
+        if ((ignore_system_lyxrc ||
+            default_otf_view_format != system_lyxrc.default_otf_view_format)
+            && !default_otf_view_format.empty()) {
                        os << "\\default_otf_view_format " << default_otf_view_format << '\n';
                }
                if (tag != RC_LAST)
@@ -3004,6 +3007,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_PATH_PREFIX:
                if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
                        prependEnvPath("PATH", lyxrc_new.path_prefix);
+                       // Resets python path
+                       support::os::python(true);
                }
        case LyXRC::RC_PREVIEW:
        case LyXRC::RC_PREVIEW_HASHED_LABELS: