Merge branch 'NixOS:master' into debug-exploratory-PR

2022-05-05 13:54:20 -06:00
parent 58645a78ab f4102de84b
commit 0ac121a094
3 changed files with 33 additions and 26 deletions
@@ -673,7 +673,8 @@ std::vector<std::string> AttrCursor::getListOfStrings()
    for (auto & elem : v.listItems())
        res.push_back(std::string(root->state.forceStringNoCtx(*elem)));

-    cachedValue = {root->db->setListOfStrings(getKey(), res), res};
+    if (root->db)
+        cachedValue = {root->db->setListOfStrings(getKey(), res), res};

    return res;
 }