OK, the final commit before the next release (famous last words).

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1635 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2009-01-16 20:00:35 +00:00
parent 35f5657db5
commit ab4d878e33
1 changed files with 4 additions and 10 deletions

View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: FSNodeWin32.cxx,v 1.21 2009-01-16 19:37:29 stephena Exp $ // $Id: FSNodeWin32.cxx,v 1.22 2009-01-16 20:00:35 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -287,15 +287,9 @@ WindowsFilesystemNode::WindowsFilesystemNode(const string& p)
if ( p.length() >= 2 && p[0] == '~' && p[1] == '\\') if ( p.length() >= 2 && p[0] == '~' && p[1] == '\\')
{ {
_path = myDocsFinder.getPath(); _path = myDocsFinder.getPath();
if (_path != "") // Skip over the tilda. We know that p contains at least
{ // two chars, so this is safe:
// Skip over the tilda. We know that p contains at least _path += p.c_str() + 1;
// two chars, so this is safe:
_path += p.c_str() + 1;
expanded = true;
}
else
currentDir = true;
} }
// Expand ".\\" to the current directory // Expand ".\\" to the current directory
else if ( p.length() >= 2 && p[0] == '.' && p[1] == '\\') else if ( p.length() >= 2 && p[0] == '.' && p[1] == '\\')