diff -u audacity-1.3.9/debian/changelog audacity-1.3.9/debian/changelog --- audacity-1.3.9/debian/changelog +++ audacity-1.3.9/debian/changelog @@ -1,3 +1,9 @@ +audacity (1.3.9-3ubuntu1) karmic; urgency=low + + * Add patch to prevent crash when selecting sound card driver + + -- David Henningsson Sat, 26 Sep 2009 10:31:03 +0200 + audacity (1.3.9-3) unstable; urgency=low * Add debian/patches/gsocket.patch to fix conflicting GSocket definition. only in patch2: unchanged: --- audacity-1.3.9.orig/debian/patches/switch-hostapi-crash.patch +++ audacity-1.3.9/debian/patches/switch-hostapi-crash.patch @@ -0,0 +1,25 @@ +diff -Nur -x '*.orig' -x '*~' audacity-1.3.9/src/prefs/DevicePrefs.cpp audacity-1.3.9.new/src/prefs/DevicePrefs.cpp +--- audacity-1.3.9/src/prefs/DevicePrefs.cpp 2009-08-31 12:45:38.000000000 +0200 ++++ audacity-1.3.9.new/src/prefs/DevicePrefs.cpp 2009-09-26 10:30:10.717880112 +0200 +@@ -301,6 +301,10 @@ + wxLogDebug(wxT("GetDefaultPlayDevice(): HostAPI index %d, name %s"), index, wxString(apiinfo->name, wxConvLocal).c_str()); + wxLogDebug(wxT("GetDefaultPlayDevice() default output %d"), apiinfo->defaultOutputDevice); + const PaDeviceInfo* devinfo = Pa_GetDeviceInfo(apiinfo->defaultOutputDevice); ++ if (devinfo == NULL) { ++ wxLogDebug(wxT("GetDefaultPlayDevice() no default output device")); ++ return wxString("", wxConvLocal); ++ } + wxString name(devinfo->name, wxConvLocal); + wxLogDebug(wxT("GetDefaultPlayDevice() default output device name %s"), name.c_str()); + return name; +@@ -313,6 +317,10 @@ + wxLogDebug(wxT("GetDefaultRecordDevice(): HostAPI index %d, name %s"), index, wxString(apiinfo->name, wxConvLocal).c_str()); + wxLogDebug(wxT("GetDefaultRecordDevice() default input %d"), apiinfo->defaultInputDevice); + const PaDeviceInfo* devinfo = Pa_GetDeviceInfo(apiinfo->defaultInputDevice); ++ if (devinfo == NULL) { ++ wxLogDebug(wxT("GetDefaultRecordDevice() no default input device")); ++ return wxString("", wxConvLocal); ++ } + wxString name(devinfo->name, wxConvLocal); + wxLogDebug(wxT("GetDefaultRecordDevice() default input device name %s"), name.c_str()); + return name;