Merge branch '1.9.1' into devel

2011-09-19 12:48:15 -04:00 · 2011-09-19 12:48:15 -04:00 · debfcc112d
commit debfcc112d
parent 8679194c33 2152ae5b3a
2 changed files with 31 additions and 29 deletions
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@ -381,6 +381,9 @@ function setAddShowEvents() {
 		}else{
 			duration = '0m';
 		}
+		if(isNaN(duration)){
+		    duration = '1h';
+		}
 		$('#add_show_duration').val(duration);
 	}