fix behaviour when a viewer has not been found

[features.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index e7d25273a6c7bf0b1cbd691814381c8b340f716b..cc25842280416196170d3cfaeed86cf45b2a1514 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -977,7 +977,8 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next()) {
                                flags = lexrc.getString();
                        }
-                       if (command.empty() || command == "none") {
+                       if (command.empty()
+                           || token(command, ' ', 0) == "none") {
                                converters.erase(from, to);
                        } else {
                                converters.add(from, to, command, flags);
@@ -991,6 +992,8 @@ int LyXRC::read(string const & filename)
                        }
                        if (lexrc.next()) {
                                command = lexrc.getString();
+                               if (token(command, ' ', 0) == "none")
+                                       command.erase();
                        }
                        formats.setViewer(format, command);
                        break;