Skip to content

Commit

Permalink
Merge branch 'master' into new-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
Beirdo committed Jun 7, 2011
2 parents d1f59fb + 347fc87 commit 3216225
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/mainserver.cpp
Expand Up @@ -4389,7 +4389,7 @@ void MainServer::GetFilesystemInfos(QList<FileSystemInfo> &fsInfos)
size_t maxWriteFiveSec = GetCurrentMaxBitrate()/12 /*5 seconds*/;
maxWriteFiveSec = max((size_t)2048, maxWriteFiveSec); // safety for NFS mounted dirs

FileSystemInfo::Consolidate(fsInfos, true, maxWriteFiveSec);
FileSystemInfo::Consolidate(fsInfos, false, maxWriteFiveSec);

QList<FileSystemInfo>::iterator it1;
if (VERBOSE_LEVEL_CHECK(VB_FILE|VB_SCHEDULE))
Expand Down

0 comments on commit 3216225

Please sign in to comment.