Ticket #2426: crash_on_calcsliderpos.diff
File crash_on_calcsliderpos.diff, 1.9 KB (added by , 17 years ago) |
---|
-
libs/libmythtv/tv_play.cpp
3475 3475 3476 3476 void TV::DoPause(bool showOSD) 3477 3477 { 3478 if (activerbuffer->InDVDMenuOrStillFrame()) 3478 QMutexLocker locker(&stateLock); 3479 if (activerbuffer && 3480 activerbuffer->InDVDMenuOrStillFrame()) 3481 { 3479 3482 return; 3483 } 3480 3484 3481 3485 speed_index = 0; 3482 3486 float time = 0.0; … … 4984 4988 { 4985 4989 stayPaused = paused; 4986 4990 if (!paused) 4987 DoPause( );4991 DoPause(false); 4988 4992 } 4989 4993 if (theme) 4990 4994 delete theme; … … 4997 5001 delete nextProgram; 4998 5002 } 4999 5003 if (paused & !stayPaused) 5000 DoPause( );5004 DoPause(false); 5001 5005 break; 5002 5006 } 5003 5007 } … … 5007 5011 { 5008 5012 bool stayPaused = paused; 5009 5013 if (!paused) 5010 DoPause( );5014 DoPause(false); 5011 5015 5012 5016 switch (editType) 5013 5017 { … … 5042 5046 } 5043 5047 5044 5048 if (!stayPaused) 5045 DoPause( );5049 DoPause(false); 5046 5050 } 5047 5051 5048 5052 // Resize the window back to the MythTV Player size … … 7446 7450 7447 7451 bool stayPaused = paused; 7448 7452 if (!paused) 7449 DoPause( );7453 DoPause(false); 7450 7454 QString recGroupPassword; 7451 7455 lastProgram->UpdateRecGroup(); 7452 7456 recGroupPassword = ProgramInfo::GetRecGroupPassword(lastProgram->recgroup); … … 7470 7474 GetOSD()->SetSettingsText(msg, 3); 7471 7475 } 7472 7476 if (paused && !stayPaused) 7473 DoPause( );7477 DoPause(false); 7474 7478 return false; 7475 7479 } 7476 7480 } 7477 7481 if (paused && !stayPaused) 7478 DoPause( );7482 DoPause(false); 7479 7483 return true; 7480 7484 } 7481 7485