From ab6b4679e69b50ad84b0d801b8221037c3f741b0 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 24 Feb 2018 01:06:36 -0500 Subject: [PATCH] Fix bug #10918. --- src/LyXRC.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 9e42857a7d..f0f82622f7 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -430,7 +430,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) return ReadError; // format prior to 2.0 and introduction of format tag - unsigned int format = 0; + unsigned int rc_format = 0; while (lexrc.isOK()) { // By using two switches we take advantage of the compiler @@ -453,7 +453,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) switch (static_cast(le)) { case RC_LYXRCFORMAT: if (lexrc.next()) - format = lexrc.getInteger(); + rc_format = lexrc.getInteger(); break; case RC_INPUT: // Include file if (lexrc.next()) { @@ -1232,7 +1232,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) // This is triggered the first time through the loop unless // we hit a format tag. - if (check_format && format != LYXRC_FILEFORMAT) + if (check_format && rc_format != LYXRC_FILEFORMAT) return FormatMismatch; } -- 2.39.2