eeva/jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for bug that software crashed in case the driver properties of current selected driver have incompatibly changed

Browse Source
This commit is contained in:
Volker Fischer 2009-11-30 21:16:40 +00:00
parent 05e21fa2bc
commit 278a252822
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clientsettingsdlg.cpp
View File

@ -380,7 +380,7 @@ void CClientSettingsDlg::OnSoundCrdSelection ( int iSndDevIdx )
if ( !strError.isEmpty() )
{
QMessageBox::critical ( 0, APP_NAME,
QMessageBox::critical ( this, APP_NAME,
QString ( "The selected audio device could not be used because "
"of the following error: " ) + strError +
QString ( " The previous driver will be selected." ), "Ok", 0 );

21
windows/sound.cpp
View File

@ -76,9 +76,24 @@ std::string CSound::SetDev ( const int iNewDev )
if ( !strErrorMessage.empty() )
{
// loading and initializing the new driver failed, go back to
// original driver and display error message
LoadAndInitializeDriver ( lCurDev );
if ( iNewDev != lCurDev )
{
// loading and initializing the new driver failed, go back to
// original driver and display error message
LoadAndInitializeDriver ( lCurDev );
}
else
{
// the same driver is used but the driver properties seems to
// have changed so that they are not compatible to our
// software anymore
QMessageBox::critical (
0, APP_NAME, "The audio driver properties have changed to "
"a state which is incompatible to this software. "
"Please restart the software.", "Close", 0 );
_exit ( 0 );
}
// store error return message
strReturn = strErrorMessage;