Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 0e2e964501edd1f4bf6ae3b97c0f46f2ddce535f..1790d979b6e2cd4a8b7999f9be39ea323206420d 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -24,6 +24,8 @@
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/filetools.h"
+#include <boost/filesystem/operations.hpp>
+namespace fs = boost::filesystem;
 
 #include <sstream>
 
@@ -910,13 +912,15 @@ bool LyXTextClass::delete_layout(string const & name)
 
 
 // Load textclass info if not loaded yet
-bool LyXTextClass::load() const
+bool LyXTextClass::load(string const & path) const
 {
        if (loaded_)
                return true;
 
-       // Read style-file
-       string const real_file = libFileSearch("layouts", name_, "layout");
+       // Read style-file, current directory is searched before system ones
+       string real_file = path + "/" + name_ + ".layout";
+       if (!fs::exists(real_file))
+               real_file = libFileSearch("layouts", name_, "layout");
        loaded_ = const_cast<LyXTextClass*>(this)->read(real_file) == 0;
 
        if (!loaded_) {