Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-20 15:41:18 +01:00
Code Issues Releases Wiki Activity

Bug 1220: Residuals.

Browse Source 
Space required in path name.  Also force old names that were set to temp directory to update to ones that aren't on Mac too.
Something to test on Mac -> What happens if suggested directory does not exist?
This commit is contained in:
James Crook
2016-07-06 16:01:23 +01:00
parent eb32438907
commit 07090e691b
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/AudacityApp.cpp
View File

@@ -1302,7 +1302,7 @@ bool AudacityApp::OnInit()
// JKC Bug 1220: Using an actual temp directory for session data on Mac was // JKC Bug 1220: Using an actual temp directory for session data on Mac was
// wrong because it would get cleared out on a reboot. // wrong because it would get cleared out on a reboot.
defaultTempDir.Printf(wxT("%s/Library/Application/Support/audacity/SessionData"), defaultTempDir.Printf(wxT("%s/Library/Application\ Support/audacity/SessionData"),
tmpDirLoc.c_str()); tmpDirLoc.c_str());
//defaultTempDir.Printf(wxT("%s/audacity-%s"), //defaultTempDir.Printf(wxT("%s/audacity-%s"),
@@ -1579,9 +1579,6 @@ void AudacityApp::OnKeyDown(wxKeyEvent &event)
// We now disallow temp directory name that puts it where cleaner apps will // We now disallow temp directory name that puts it where cleaner apps will
// try to clean out the files. // try to clean out the files.
bool AudacityApp::IsTempDirectoryNameOK( const wxString & Name ){ bool AudacityApp::IsTempDirectoryNameOK( const wxString & Name ){
#ifndef __WXMSW__
return true;
#else
wxFileName tmpFile; wxFileName tmpFile;
tmpFile.AssignTempFileName(wxT("nn")); tmpFile.AssignTempFileName(wxT("nn"));
// use Long Path to expand out any abbreviated long substrings. // use Long Path to expand out any abbreviated long substrings.
@@ -1591,7 +1588,6 @@ bool AudacityApp::IsTempDirectoryNameOK( const wxString & Name ){
wxFileName cmpFile( Name ); wxFileName cmpFile( Name );
wxString NameCanonical = cmpFile.GetLongPath( ) + "\\"; wxString NameCanonical = cmpFile.GetLongPath( ) + "\\";
return !(NameCanonical.StartsWith( BadPath )); return !(NameCanonical.StartsWith( BadPath ));
#endif
} }
bool AudacityApp::InitTempDir() bool AudacityApp::InitTempDir()

2
src/prefs/DirectoriesPrefs.cpp
View File

@@ -151,8 +151,6 @@ void DirectoriesPrefs::OnChooseTempDir(wxCommandEvent & e)
newDirName = wxT("SessionData"); newDirName = wxT("SessionData");
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
// Clearing Bug 1271 residual issue. Let's NOT have temp in the name. // Clearing Bug 1271 residual issue. Let's NOT have temp in the name.
// [Arguably we should do this for all platforms, not just Windows
// which has cleaners that clean up temp data. For another day].
newDirName = wxT("SessionData"); newDirName = wxT("SessionData");
#else #else
newDirName = wxT(".audacity_temp"); newDirName = wxT(".audacity_temp");