[Gemrb-commits] gemrb: branch master updated. a02004e17d6c11a145b14921a55401f9da234f90

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a02004e17d6c11a145b14921a55401f9da234f90 (commit)

Summary of changes:
 gemrb/core/VFS.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
      from  3641a047ee8821f0ee7ce6151850bd5def63ebf3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=a02004e17d6c11a145b14921a55401f9da234f90

commit a02004e17d6c11a145b14921a55401f9da234f90
Author: Tom Prince <tom...@ua...>
Date:   Wed May 5 09:33:24 2010 -0600

    PathJoin: Fix dropping of path component on failed lookup.
    
    Signed-off-by: Tom Prince <tom...@ua...>

diff --git a/gemrb/core/VFS.cpp b/gemrb/core/VFS.cpp
index 2457f7e..93bd965 100644
--- a/gemrb/core/VFS.cpp
+++ b/gemrb/core/VFS.cpp
@@ -303,7 +303,6 @@ bool PathJoin (char *target, const char *base, ...)
 				continue;
 			} else if (slash) {
 				strncat(filename, source, slash-source);
-				source = slash + 1;
 			} else {
 				strcpy(filename, source);
 			}
@@ -312,6 +311,7 @@ bool PathJoin (char *target, const char *base, ...)
 				goto finish;
 			}
 			PathAppend(target, filename);
+			source = slash + 1;
 		} while (slash);
 	}
 	va_end( ap );

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator