mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed a crash when trying to delete a channel that is being used by a timer
This commit is contained in:
		
							
								
								
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							| @@ -8843,3 +8843,4 @@ Video Disk Recorder Revision History | ||||
|   same thread. This fixes possible crashes when moving or deleting channels in | ||||
|   the menu or through SVDRP (as well as other operations that try to acquire a | ||||
|   read lock within a write lock). | ||||
| - Fixed a crash when trying to delete a channel that is being used by a timer. | ||||
|   | ||||
							
								
								
									
										3
									
								
								menu.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								menu.c
									
									
									
									
									
								
							| @@ -4,7 +4,7 @@ | ||||
|  * See the main source file 'vdr.c' for copyright information and | ||||
|  * how to reach the author. | ||||
|  * | ||||
|  * $Id: menu.c 4.13 2015/09/16 11:02:33 kls Exp $ | ||||
|  * $Id: menu.c 4.14 2016/12/08 10:39:29 kls Exp $ | ||||
|  */ | ||||
|  | ||||
| #include "menu.h" | ||||
| @@ -498,6 +498,7 @@ eOSState cMenuChannels::Delete(void) | ||||
|      int DeletedChannel = Channel->Number(); | ||||
|      // Check if there is a timer using this channel: | ||||
|      if (Timers->UsesChannel(Channel)) { | ||||
|         channelsStateKey.Remove(false); | ||||
|         Skins.Message(mtError, tr("Channel is being used by a timer!")); | ||||
|         return osContinue; | ||||
|         } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user