* QPrefsDialog::QPrefsDialog():

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 1fde276e7942597c5e36c62a64543080724195ab..ffcf4741761976e09c2dbf8b44588daeeaa886f6 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -284,7 +284,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                        lay.setName(name);
                                        if (le == TC_ENVIRONMENT)
                                                lay.is_environment = true;
-                                       if (!(error = do_readStyle(lexrc, lay)))
+                                       error = do_readStyle(lexrc, lay);
+                                       if (!error)
                                                layoutlist_.push_back(
                                                        boost::shared_ptr<LyXLayout>(new LyXLayout(lay))
                                                        );