From ef908ee894dad1566148eedfab01012cd471c16c Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 13 Apr 2012 11:09:52 +0200
Subject: [PATCH] CC-3626 : Playlist Builder -> you can not add files from
 Library by using "+" button (if default Fades were changed in Preferences)

---
 airtime_mvc/application/models/Preference.php | 9 ++++++++-
 airtime_mvc/application/models/Scheduler.php  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index a267c142a..8d4faf7d4 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -151,7 +151,14 @@ class Application_Model_Preference
     }
 
     public static function GetDefaultFade() {
-        return self::GetValue("default_fade");
+        $fade = self::GetValue("default_fade");
+        
+        if ($fade === "") {
+            return null;
+        } 
+        
+        $fade = number_format($fade, 6);
+        return $fade;
     }
     
     public static function SetDefaultTransitionFade($fade) {
diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index 7515ac0b4..38f6d3fb0 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -132,7 +132,7 @@ class Application_Model_Scheduler {
                 $data["cueout"] = $file->getDbLength();
 
                 $defaultFade = Application_Model_Preference::GetDefaultFade();
-                if ($defaultFade !== "") {
+                if (isset($defaultFade)) {
                     //fade is in format SS.uuuuuu
                     $data["fadein"] = $defaultFade;
                     $data["fadeout"] = $defaultFade;