From aee7748ee36b7848a6c0ee1e8adffe850e2e5228 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 12 Nov 2008 04:27:42 +0000
Subject: [PATCH] fix scan_directory for multifiles

---
 panda/src/express/multifile.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panda/src/express/multifile.cxx b/panda/src/express/multifile.cxx
index 8dab8ae9ab..74ffa1e5d1 100644
--- a/panda/src/express/multifile.cxx
+++ b/panda/src/express/multifile.cxx
@@ -861,12 +861,12 @@ scan_directory(vector_string &contents, const string &subfile_name) const {
     if (!(subfile->_name.length() > prefix.length() &&
           subfile->_name.substr(0, prefix.length()) == prefix)) {
       // We've reached the end of the list of subfiles beneath the
-      // indicated direcotry prefix.
+      // indicated directory prefix.
       return true;
     }
 
     size_t slash = subfile->_name.find('/', prefix.length());
-    string basename = subfile->_name.substr(prefix.length(), slash);
+    string basename = subfile->_name.substr(prefix.length(), slash - prefix.length());
     if (basename != previous) {
       contents.push_back(basename);
       previous = basename;