Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 8c48aaf9f85953645380e6097f85433df89e0c5e..924b7e2698aed4cf8774ea87d7c411873df6cc30 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -406,9 +406,18 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
                if (pp.first) {
                        textclass = pp.second;
                } else {
-                       textclass = 0;
-                       return classname;
+                       // if text class does not exist, try to load it from filepath
+                       pp = textclasslist.addTextClass(classname, filepath);
+                       if (pp.first) {
+                               textclass = pp.second;
+                       } else {        
+                               textclass = 0;
+                               return classname;
+                       }       
                }
+               // FIXME: isTeXClassAvailable will try to load the layout file, but will
+               // fail because of the lack of path info. Warnings will be given although
+               // the layout file will be correctly loaded later.
                if (!getLyXTextClass().isTeXClassAvailable()) {
                        string const msg =
                                bformat(_("The document uses a missing "