Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-03 09:09:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into scrubbing

Browse Source
This commit is contained in:
Paul Licameli 2016-04-19 14:03:44 -04:00
commit 44ed23f217
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tracks/ui/Scrubbing.cpp
View File

@ -318,10 +318,10 @@ void Scrubber::StopScrubbing()
ControlToolBar *const ctb = mProject->GetControlToolBar();
ctb->StopPlaying();
}
return true;
return;
}
else
return false;
return;
}
bool Scrubber::IsScrubbing() const

4
win/audacity.iss
View File

@ -52,6 +52,10 @@ VersionInfoDescription={#AppName + " " + AppVersion + " Setup"}
VersionInfoVersion={#GetFileVersion(AppExe)}
VersionInfoCopyright={#GetFileCopyright(AppExe)}
; Don't disable the "Select Destination Location" wizard, even if
; Audacity is already installed.
DisableDirPage=no
; Always warn if dir exists, because we'll overwrite previous Audacity.
DirExistsWarning=yes
DisableProgramGroupPage=yes