From ea3b967f8a8ea17aff60582a28109479abe5ef2b Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 13 Mar 2012 17:35:28 +0000 Subject: [PATCH] support loading icons through the VFS --- panda/src/x11display/x11GraphicsWindow.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/x11display/x11GraphicsWindow.cxx b/panda/src/x11display/x11GraphicsWindow.cxx index c59ca1d907..1c8acfd347 100644 --- a/panda/src/x11display/x11GraphicsWindow.cxx +++ b/panda/src/x11display/x11GraphicsWindow.cxx @@ -1883,8 +1883,9 @@ get_cursor(const Filename &filename) { } // If it wasn't found, resolve the filename and search for that. - Filename resolved = filename; - if (!resolved.resolve_filename(get_model_path())) { + VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr(); + Filename resolved (filename); + if (!vfs->resolve_filename(resolved, get_model_path())) { // The filename doesn't exist. x11display_cat.warning() << "Could not find cursor filename " << filename << "\n"; @@ -1897,7 +1898,6 @@ get_cursor(const Filename &filename) { } // Open the file through the virtual file system. - VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr(); istream *str = vfs->open_read_file(resolved, true); if (str == NULL) { x11display_cat.warning()