mirror of
https://github.com/cookiengineer/audacity
synced 2025-07-05 23:19:06 +02:00
better fix for bug 307
This commit is contained in:
parent
bbdb415a82
commit
953d31c8d3
@ -4691,17 +4691,6 @@ void AudacityProject::OnImport()
|
|||||||
// this serves to track the file if the users zooms in and such.
|
// this serves to track the file if the users zooms in and such.
|
||||||
wxGetApp().SetMissingAliasedFileWarningShouldShow(true);
|
wxGetApp().SetMissingAliasedFileWarningShouldShow(true);
|
||||||
|
|
||||||
// bug 307 fix:
|
|
||||||
// Apparently the shift key-up event gets swallowed by the file open dialog.
|
|
||||||
// The default shortcut for this command it Ctrl+Shift+I,
|
|
||||||
// so make sure the loop play button is reset.
|
|
||||||
if (GetControlToolBar())
|
|
||||||
{
|
|
||||||
wxKeyEvent dummyEvent;
|
|
||||||
dummyEvent.m_keyCode = WXK_SHIFT;
|
|
||||||
GetControlToolBar()->OnKeyUp(dummyEvent);
|
|
||||||
}
|
|
||||||
|
|
||||||
wxArrayString selectedFiles = ShowOpenDialog(wxT(""));
|
wxArrayString selectedFiles = ShowOpenDialog(wxT(""));
|
||||||
if (selectedFiles.GetCount() == 0) {
|
if (selectedFiles.GetCount() == 0) {
|
||||||
gPrefs->Write(wxT("/LastOpenType"),wxT(""));
|
gPrefs->Write(wxT("/LastOpenType"),wxT(""));
|
||||||
|
@ -936,6 +936,16 @@ void TrackPanel::OnTimer()
|
|||||||
wxCommandEvent dummyEvent;
|
wxCommandEvent dummyEvent;
|
||||||
AudacityProject *p = GetProject();
|
AudacityProject *p = GetProject();
|
||||||
|
|
||||||
|
// bug 307 fix:
|
||||||
|
// Apparently Shift key-up events get swallowed if a command with a Shift
|
||||||
|
// in its keyboard accelerator opens a dialog.
|
||||||
|
if (!wxGetKeyState(WXK_SHIFT) && p->GetControlToolBar())
|
||||||
|
{
|
||||||
|
wxKeyEvent dummyEvent;
|
||||||
|
dummyEvent.m_keyCode = WXK_SHIFT;
|
||||||
|
p->GetControlToolBar()->OnKeyUp(dummyEvent);
|
||||||
|
}
|
||||||
|
|
||||||
if ((p->GetAudioIOToken() > 0) &&
|
if ((p->GetAudioIOToken() > 0) &&
|
||||||
gAudioIO->IsStreamActive(p->GetAudioIOToken()))
|
gAudioIO->IsStreamActive(p->GetAudioIOToken()))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user