[openMSX-commits] SF.net SVN: openmsx:[12148] openmsx/trunk/src

[<man...@us...>]

Revision: 12148
          http://openmsx.svn.sourceforge.net/openmsx/?rev=12148&view=rev
Author:   manuelbi
Date:     2011-05-01 18:31:04 +0000 (Sun, 01 May 2011)

Log Message:
-----------
Better fix for resolving OMR files in current dir.

It is now solved more generally, but letting UserDataFileContext also
look at the current directory, similar to UserFileContext.

Modified Paths:
--------------
    openmsx/trunk/src/ReplayCLI.cc
    openmsx/trunk/src/file/FileContext.cc

Modified: openmsx/trunk/src/ReplayCLI.cc
===================================================================
--- openmsx/trunk/src/ReplayCLI.cc	2011-05-01 12:09:32 UTC (rev 12147)
+++ openmsx/trunk/src/ReplayCLI.cc	2011-05-01 18:31:04 UTC (rev 12148)
@@ -5,8 +5,6 @@
 #include "GlobalCommandController.hh"
 #include "MSXException.hh"
 #include "TclObject.hh"
-#include "Filename.hh"
-#include "FileContext.hh"
 
 using std::deque;
 using std::string;
@@ -40,10 +38,7 @@
 	command.addListElement("reverse");
 	command.addListElement("loadreplay");
 	command.addListElement("-viewonly");
-	// resolve also current dir file context...
-	CurrentDirFileContext context;
-	Filename fileName(Filename(filename, context));
-	command.addListElement(fileName.getResolved());
+	command.addListElement(filename);
 	command.executeCommand();
 }
 

Modified: openmsx/trunk/src/file/FileContext.cc
===================================================================
--- openmsx/trunk/src/file/FileContext.cc	2011-05-01 12:09:32 UTC (rev 12147)
+++ openmsx/trunk/src/file/FileContext.cc	2011-05-01 18:31:04 UTC (rev 12148)
@@ -173,6 +173,7 @@
 
 UserDataFileContext::UserDataFileContext(const string& subDir)
 {
+	paths.push_back("");
 	paths.push_back(USER_OPENMSX + '/' + subDir);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.