installer: further preparation

[lyx.git] / src / BufferList.cpp

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index a5c4b42f0365502a0f1824fc4df2a555bf37d26c..341ddf455bdcbd5ba83a412aad846909ec82aa91 100644 (file)
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -92,13 +92,15 @@ BufferList::const_iterator BufferList::end() const
 
 void BufferList::release(Buffer * buf)
 {
-       LASSERT(buf, /**/);
+       // We may leak here, but we probably do not need to
+       // shut down.
+       LASSERT(buf, return);
        BufferStorage::iterator const it =
                find(bstore.begin(), bstore.end(), buf);
        if (it != bstore.end()) {
                Buffer * tmp = (*it);
-               LASSERT(tmp, /**/);
                bstore.erase(it);
+               LASSERT(tmp, return);
                delete tmp;
        }
 }
@@ -192,13 +194,14 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 
 Buffer * BufferList::next(Buffer const * buf) const
 {
-       LASSERT(buf, /**/);
+       // Something is wrong, but we can probably survive it.
+       LASSERT(buf, return 0);
 
        if (bstore.empty())
                return 0;
        BufferStorage::const_iterator it = 
                        find(bstore.begin(), bstore.end(), buf);
-       LASSERT(it != bstore.end(), /**/);
+       LASSERT(it != bstore.end(), return 0);
        ++it;
        Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it;
        return nextbuf;
@@ -207,13 +210,14 @@ Buffer * BufferList::next(Buffer const * buf) const
 
 Buffer * BufferList::previous(Buffer const * buf) const
 {
-       LASSERT(buf, /**/);
+       // Something is wrong, but we can probably survive it.
+       LASSERT(buf, return 0);
 
        if (bstore.empty())
                return 0;
        BufferStorage::const_iterator it = 
                        find(bstore.begin(), bstore.end(), buf);
-       LASSERT(it != bstore.end(), /**/);
+       LASSERT(it != bstore.end(), return 0);
 
        Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1);
        return previousbuf;
@@ -221,8 +225,10 @@ Buffer * BufferList::previous(Buffer const * buf) const
 
 
 void BufferList::updateIncludedTeXfiles(string const & masterTmpDir,
-                                       OutputParams const & runparams)
+                                       OutputParams const & runparams_in)
 {
+       OutputParams runparams = runparams_in;
+       runparams.is_child = true;
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
        for (; it != end; ++it) {
@@ -233,6 +239,7 @@ void BufferList::updateIncludedTeXfiles(string const & masterTmpDir,
                        (*it)->markDepClean(masterTmpDir);
                }
        }
+       runparams.is_child = false;
 }
 
 
@@ -262,11 +269,13 @@ bool BufferList::exists(FileName const & fname) const
 
 
 namespace {
+
 struct equivalent_to : public binary_function<FileName, FileName, bool>
 {
        bool operator()(FileName const & x, FileName const & y) const
        { return equivalent(x, y); }
 };
+
 }