Embedding: merge lyx::EmbeddedFiles to lyx::support::EmbeddedFileList

[lyx.git] / src / frontends / qt4 / GuiDocument.cpp

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 19212fa525d37e1d83add8eb38153da2d0e9e9a4..ad08b559da5eba1e1d41cb055cb9024436fd0d11 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -970,10 +970,10 @@ void GuiDocument::updateEmbeddedFileList()
 {
        embeddedFilesModule->filesLW->clear();
        // add current embedded files
-       EmbeddedFiles & files = buffer().embeddedFiles();
-       files.update();
-       EmbeddedFiles::EmbeddedFileList::iterator fit = files.begin();
-       EmbeddedFiles::EmbeddedFileList::iterator fit_end = files.end();
+       EmbeddedFileList & files = buffer().embeddedFiles();
+       files.update(buffer());
+       EmbeddedFileList::iterator fit = files.begin();
+       EmbeddedFileList::iterator fit_end = files.end();
        for (; fit != fit_end; ++fit) {
                QString label = toqstr(fit->relFilename(buffer().filePath()));
                if (fit->refCount() > 1)
@@ -1713,6 +1713,8 @@ vector<string> GuiDocument::getPackageList(string const & modName) const
 bool GuiDocument::isModuleAvailable(string const & modName) const
 {
        LyXModule * mod = moduleList[modName];
+       if (!mod)
+               return false;
        return mod->isAvailable();
 }