adjust

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index ae7acb338392d667a76a42cdbf0e6e2ea0d4c7db..71e1aaf0d0a262643a69e2be2b29d394d3344fb3 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -92,28 +92,28 @@ bool ModuleList::load() {
                default:
                        string const modName = lex.getString();
                        LYXERR(Debug::TCLASS) << "Module name: " << modName << endl;
-                       if (lex.next()) {
-                               string const fname = lex.getString();
-                               LYXERR(Debug::TCLASS) << "Filename: " << fname << endl;
-                               if (lex.next()) {
-                                       string const desc = lex.getString();
-                                       LYXERR(Debug::TCLASS) << "Description: " << desc << endl;
-                                       //FIXME Add packages
-                                       if (lex.next()) {
-                                               string packages = lex.getString();
-                                               LYXERR(Debug::TCLASS) << "Packages: " << packages << endl;
-                                               vector<string> pkgs;
-                                               while (!packages.empty()) {
-                                                       string p;
-                                                       packages = support::split(packages, p, ',');
-                                                       pkgs.push_back(p);
-                                               }
-                                               // This code is run when we have
-                                               // modName, fname, desc, and pkgs
-                                               addLayoutModule(modName, fname, desc, pkgs);
-                                       }
-                               }
+                       if (!lex.next())
+                               break;
+                       string const fname = lex.getString();
+                       LYXERR(Debug::TCLASS) << "Filename: " << fname << endl;
+                       if (!lex.next())
+                               break;
+                       string const desc = lex.getString();
+                       LYXERR(Debug::TCLASS) << "Description: " << desc << endl;
+                       //FIXME Add packages
+                       if (!lex.next())
+                               break;
+                       string packages = lex.getString();
+                       LYXERR(Debug::TCLASS) << "Packages: " << packages << endl;
+                       vector<string> pkgs;
+                       while (!packages.empty()) {
+                               string p;
+                               packages = support::split(packages, p, ',');
+                               pkgs.push_back(p);
                        }
+                       // This code is run when we have
+                       // modName, fname, desc, and pkgs
+                       addLayoutModule(modName, fname, desc, pkgs);
                } // end switch
        } //end while