From 05917ee0b43fadbb810ff59374cc2e4f669d7d5d Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 5 Feb 2009 00:12:32 +0000 Subject: [PATCH] support ./ --- panda/src/tinydisplay/tinyOsxGraphicsWindow.mm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm index b368903462..a53c16a4d1 100644 --- a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm +++ b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm @@ -545,10 +545,14 @@ bool TinyOsxGraphicsWindow::set_icon_filename(const Filename &icon_filename) Filename icon_pathname = icon_filename; if (!vfs->resolve_filename(icon_pathname, get_model_path())) { - // The filename doesn't exist. - tinydisplay_cat.warning() - << "Could not find icon filename " << icon_filename << "\n"; - return false; + // The filename doesn't exist along the search path. + if (icon_pathname.is_fully_qualified() && vfs->exists(icon_pathname)) { + // But it does exist locally, so accept it. + } else { + tinydisplay_cat.warning() + << "Could not find icon filename " << icon_filename << "\n"; + return false; + } }