Updates from Bennett and myself.

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 45c3ae2e092b99a39612603aa3b4452cde1b33e6..728116849b7873b212bdb54da6ca8c28455141c7 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -113,6 +113,7 @@ using support::bformat;
 using support::changeExtension;
 using support::contains;
 using support::FileFilterList;
+using support::FileName;
 using support::fileSearch;
 using support::ForkedcallsController;
 using support::i18nLibFileSearch;
@@ -376,11 +377,9 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
           Note that this code is not perfect, as bug 1941 attests:
           http://bugzilla.lyx.org/show_bug.cgi?id=1941#c4
        */
-       Buffer * buf;
-       if (cmd.origin == FuncRequest::MENU && !lyx_view_->hasFocus())
+       Buffer * buf = lyx_view_? lyx_view_->buffer() : 0;
+       if (lyx_view_ && cmd.origin == FuncRequest::MENU && !lyx_view_->hasFocus())
                buf = 0;
-       else
-               buf = lyx_view_->buffer();
 
        if (cmd.action == LFUN_NOACTION) {
                flag.message(from_utf8(N_("Nothing to do")));
@@ -542,7 +541,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                else if (name == "character" || name == "mathpanel")
                        enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
                else if (name == "latexlog")
-                       enable = isFileReadable(buf->getLogName().second);
+                       enable = isFileReadable(FileName(buf->getLogName().second));
 #if !defined (USE_ASPELL) && !defined (USE_ISPELL) && !defined (USE_PSPELL)
                else if (name == "spellchecker")
                        enable = false;
@@ -1077,7 +1076,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                setErrorMessage(_("Missing argument"));
                                break;
                        }
-                       string const fname = i18nLibFileSearch("doc", arg, "lyx");
+                       string const fname = i18nLibFileSearch("doc", arg, "lyx").absFilename();
                        if (fname.empty()) {
                                lyxerr << "LyX: unable to find documentation file `"
                                                         << arg << "'. Bad installation?" << endl;
@@ -1883,7 +1882,7 @@ void LyXFunc::open(string const & fname)
 
        // get absolute path of file and add ".lyx" to the filename if
        // necessary
-       string const fullpath = fileSearch(string(), filename, "lyx");
+       string const fullpath = fileSearch(string(), filename, "lyx").absFilename();
        if (!fullpath.empty()) {
                filename = fullpath;
        }