mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed using the default sort mode in a video directory without a ".sort" file
This commit is contained in:
		@@ -3375,6 +3375,8 @@ Stefan Herdler <herdler@gmx.de>
 | 
				
			|||||||
 for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
 | 
					 for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
 | 
				
			||||||
 for reporting that pausing replay at the last editing mark actually paused one I-frame
 | 
					 for reporting that pausing replay at the last editing mark actually paused one I-frame
 | 
				
			||||||
 too early
 | 
					 too early
 | 
				
			||||||
 | 
					 for reporting a bug in using the default sort mode in a video directory without a
 | 
				
			||||||
 | 
					 ".sort" file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Tobias Faust <tobias.faust@gmx.de>
 | 
					Tobias Faust <tobias.faust@gmx.de>
 | 
				
			||||||
 for the original "jumpingseconds" patch
 | 
					 for the original "jumpingseconds" patch
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								HISTORY
									
									
									
									
									
								
							@@ -8568,7 +8568,7 @@ Video Disk Recorder Revision History
 | 
				
			|||||||
- Updated the French OSD texts (thanks to R<>gis Bossut).
 | 
					- Updated the French OSD texts (thanks to R<>gis Bossut).
 | 
				
			||||||
- Fixed the German translation of "Zap timeout" (thanks to Albert Danis).
 | 
					- Fixed the German translation of "Zap timeout" (thanks to Albert Danis).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2015-02-13: Version 2.2.0
 | 
					2015-02-16: Version 2.2.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
 | 
					- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
 | 
				
			||||||
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
 | 
					- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
 | 
				
			||||||
@@ -8582,3 +8582,5 @@ Video Disk Recorder Revision History
 | 
				
			|||||||
- Fixed pausing replay at the last editing mark (reported by Stefan Herdler).
 | 
					- Fixed pausing replay at the last editing mark (reported by Stefan Herdler).
 | 
				
			||||||
- Updated the Polish OSD texts (thanks to Tomasz Maciej Nowak).
 | 
					- Updated the Polish OSD texts (thanks to Tomasz Maciej Nowak).
 | 
				
			||||||
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
 | 
					- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
 | 
				
			||||||
 | 
					- Fixed using the default sort mode in a video directory without a ".sort" file
 | 
				
			||||||
 | 
					  (reported by Stefan Herdler).
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@
 | 
				
			|||||||
 * See the main source file 'vdr.c' for copyright information and
 | 
					 * See the main source file 'vdr.c' for copyright information and
 | 
				
			||||||
 * how to reach the author.
 | 
					 * how to reach the author.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * $Id: recording.c 3.27 2015/02/07 16:07:22 kls Exp $
 | 
					 * $Id: recording.c 3.28 2015/02/16 07:49:14 kls Exp $
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "recording.h"
 | 
					#include "recording.h"
 | 
				
			||||||
@@ -3027,6 +3027,7 @@ bool HasRecordingsSortMode(const char *Directory)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void GetRecordingsSortMode(const char *Directory)
 | 
					void GetRecordingsSortMode(const char *Directory)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					  RecordingsSortMode = rsmName;
 | 
				
			||||||
  if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "r")) {
 | 
					  if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "r")) {
 | 
				
			||||||
     char buf[8];
 | 
					     char buf[8];
 | 
				
			||||||
     if (fgets(buf, sizeof(buf), f))
 | 
					     if (fgets(buf, sizeof(buf), f))
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user