Fix loop when opening TOC widget in an empty document, basically by Richard Heck.

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 2e86971f4d6be3ad7d6727130197e131a967e504..11213b72542644847dfa50789ee74d823e8ebf52 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -184,7 +184,7 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 {
        auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
        tmpbuf->params().useClassDefaults();
-       lyxerr[Debug::INFO] << "Assigning to buffer "
+       LYXERR(Debug::INFO) << "Assigning to buffer "
                            << bstore.size() << endl;
        bstore.push_back(tmpbuf.get());
        return tmpbuf.release();
@@ -364,7 +364,7 @@ void BufferList::emergencyWrite(Buffer * buf)
        }
 
        // 2) In HOME directory.
-       string s = addName(package().home_dir(), buf->fileName());
+       string s = addName(package().home_dir().absFilename(), buf->fileName());
        s += ".emergency";
        lyxerr << ' ' << s << endl;
        if (buf->writeFile(FileName(s))) {
@@ -378,7 +378,7 @@ void BufferList::emergencyWrite(Buffer * buf)
        // 3) In "/tmp" directory.
        // MakeAbsPath to prepend the current
        // drive letter on OS/2
-       s = addName(package().temp_dir(), buf->fileName());
+       s = addName(package().temp_dir().absFilename(), buf->fileName());
        s += ".emergency";
        lyxerr << ' ' << s << endl;
        if (buf->writeFile(FileName(s))) {