Fix crash on OS-switch of dark/light mode (#12786)

[lyx.git] / src / LaTeXPackages.cpp

diff --git a/src/LaTeXPackages.cpp b/src/LaTeXPackages.cpp
index d2a22a8879b6fc3883e4a9c55a2bafb934f70b03..e708df1dfe2b2ac0d52dcd6a2ccd44a3d0d79a47 100644 (file)
--- a/src/LaTeXPackages.cpp
+++ b/src/LaTeXPackages.cpp
@@ -19,9 +19,11 @@
 #include "Lexer.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/Package.h"
 
 
 using namespace std;
@@ -50,6 +52,7 @@ void LaTeXPackages::getAvailable()
        packages_.clear();
 
        bool finished = false;
+       string lstformat = "1";
        // Parse config-file
        while (lex.isOK() && !finished) {
                switch (lex.lex()) {
@@ -61,10 +64,20 @@ void LaTeXPackages::getAvailable()
                        // Parse optional version info
                        lex.eatLine();
                        string const v = trim(lex.getString());
+                       if (p == "!!fileformat") {
+                               lstformat = v;
+                               continue;
+                       }
                        packages_.insert(make_pair(p, v));
                }
                }
        }
+       // Check if the pkglist has current format.
+       // Reconfigure and re-parse if not.
+       if (lstformat != "2") {
+               package().reconfigureUserLyXDir("");
+               getAvailable();
+       }
 }
 
 
@@ -92,9 +105,15 @@ bool LaTeXPackages::isAvailableAtLeastFrom(string const & name,
        // required date as int (yyyymmdd)
        int const req_date = (y * 10000) + (m * 100) + d;
        for (auto const & package : packages_) {
-               if (package.first == name && !package.second.empty())
+               if (package.first == name && !package.second.empty()) {
+                       if (!isStrInt(package.second)) {
+                               LYXERR0("Warning: Invalid date of package "
+                                       << package.first << " (" << package.second << ")");
+                               continue;
+                       }
                        // required date not newer than available date
                        return req_date <= convert<int>(package.second);
+               }
        }
        return false;
 }