From 247b7f3569e67983eabd29d329d5ddd8a2d889ae Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Fri, 11 Jan 2013 04:51:46 -0500 Subject: [PATCH] Fix editor and viewer combo boxes in prefs (#8237) (cherry picked from commit 47e98487838b6c99b2631f0b203abf89e2d739bd) --- src/LyXRC.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 8c1f75b5de..0821876ee2 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -1142,19 +1142,15 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) } case RC_VIEWER_ALTERNATIVES: { string format, command; - if (lexrc.next()) - format = lexrc.getString(); - if (lexrc.eatLine()) - command = lexrc.getString(); + lexrc >> format; + lexrc >> command; viewer_alternatives[format].insert(command); break; } case RC_EDITOR_ALTERNATIVES: { string format, command; - if (lexrc.next()) - format = lexrc.getString(); - if (lexrc.eatLine()) - command = lexrc.getString(); + lexrc >> format; + lexrc >> command; editor_alternatives[format].insert(command); break; } -- 2.39.5