Merge branches 'master' and 'master' of github.com:MythTV/mythtv

stichnot · stichnot · commit dbb5ffb20709 · 2012-03-05T15:32:02.000-08:00
diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
@@ -4043,7 +4043,7 @@ void PlaybackBox::customEvent(QEvent *event)
         }
         else if (message == "AVAILABILITY" && me->ExtraDataCount() == 8)
         {
-            const uint kMaxUIWaitTime = 100; // ms
+            const uint kMaxUIWaitTime = 10000; // ms
             QStringList list = me->ExtraDataList();
             QString key = list[0];
             CheckAvailabilityType cat =

Original file line number	Diff line number	Diff line change
`@@ -4043,7 +4043,7 @@ void PlaybackBox::customEvent(QEvent *event)`
`4043`	`4043`	`}`
`4044`	`4044`	`else if (message == "AVAILABILITY" && me->ExtraDataCount() == 8)`
`4045`	`4045`	`{`
`4046`		`- const uint kMaxUIWaitTime = 100; // ms`
	`4046`	`+ const uint kMaxUIWaitTime = 10000; // ms`
`4047`	`4047`	`QStringList list = me->ExtraDataList();`
`4048`	`4048`	`QString key = list[0];`
`4049`	`4049`	`CheckAvailabilityType cat =`