putil: fix asserts when model-cache-dir cannot be created

rdb · rdb · commit 1c357f32cae2 · 2020-02-29T15:08:05.000+01:00
Fixes panda3d#790
diff --git a/panda/src/express/virtualFileSystem.cxx b/panda/src/express/virtualFileSystem.cxx
@@ -497,8 +497,7 @@ make_directory_full(const Filename &filename) {
   // Now make the last one, and check the return value.
   PT(VirtualFile) result = do_get_file(filename, OF_make_directory);
   _lock.unlock();
-  nassertr_always(result != nullptr, false);
-  return result->is_directory();
+  return (result != nullptr) ? result->is_directory() : false;
 }
 
 /**
diff --git a/panda/src/putil/bamCache.cxx b/panda/src/putil/bamCache.cxx
@@ -133,10 +133,16 @@ set_root(const Filename &root) {
   delete _index;
   _index = new BamCacheIndex;
   _index_stale_since = 0;
+
+  if (!vfs->is_directory(_root)) {
+    util_cat.error()
+      << "Unable to make directory " << _root << ", caching disabled.\n";
+    _active = false;
+    return;
+  }
+
   read_index();
   check_cache_size();
-
-  nassertv(vfs->is_directory(_root));
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -497,8 +497,7 @@ make_directory_full(const Filename &filename) {`
`497`	`497`	`// Now make the last one, and check the return value.`
`498`	`498`	`PT(VirtualFile) result = do_get_file(filename, OF_make_directory);`
`499`	`499`	`_lock.unlock();`
`500`		`- nassertr_always(result != nullptr, false);`
`501`		`- return result->is_directory();`
	`500`	`+ return (result != nullptr) ? result->is_directory() : false;`
`502`	`501`	`}`
`503`	`502`
`504`	`503`	`/**`