Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26809

Modified Files:
        FileNames.cpp 
Log Message:
Previous change made it work for wx2.8 and broke it for wx2.6. This should make 
it work with both.

Index: FileNames.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FileNames.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FileNames.cpp       19 Nov 2006 02:20:14 -0000      1.10
+++ FileNames.cpp       7 Feb 2007 13:22:52 -0000       1.11
@@ -72,10 +72,10 @@
       // If there is a directory "Portable Settings" relative to the
       // executable's EXE file, the prefs are stored in there, otherwise
       // the prefs are stored in the user data dir provided by the OS.
-      wxFileName portablePrefsPath(PlatformCompatibility::GetExecutablePath());
-      portablePrefsPath.AppendDir(wxT("Portable Settings"));
+      wxFileName exePath(PlatformCompatibility::GetExecutablePath());
+      wxFileName portablePrefsPath(exePath.GetPath(), wxT("Portable 
Settings"));
       
-      if (portablePrefsPath.DirExists())
+      if (::wxDirExists(portablePrefsPath.GetFullPath()))
       {
          // Use "Portable Settings" folder
          gDataDir = portablePrefsPath.GetFullPath();


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to