Author: jerome
Date: 2009-01-30 13:44:02 +0100 (Fri, 30 Jan 2009)
New Revision: 3546

Modified:
   
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
   
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
   
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
Log:
* Fixed a bug initializing cc.

Modified: 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
--- 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
     2009-01-30 11:52:41 UTC (rev 3545)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
     2009-01-30 12:44:02 UTC (rev 3546)
@@ -1860,8 +1860,8 @@
                else 
if(arg0.getPropertyName().equalsIgnoreCase("deployement-terminated")){
                        
                        if(!this.initialized){
-                               new ServicesLauncher().start();
                                this.initInterface();
+                               new ServicesLauncher().run();
                        }
                }
                
@@ -2859,7 +2859,8 @@
                                        
fileBrowser.stopPlaying(CcConstants.TYPE_ATTITUNES, 
CcConstants.TYPE_REMOTELIST);
                                }
                                else{
-                                       playedGadget.getGadget().stop();
+                                       //playedGadget.getGadget().stop();
+                                       
fileBrowser.getFramework().stopCurrentGadget();
                                }
                        }
                        setPlayerControlsConsistants(true);

Modified: 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
===================================================================
--- 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
 2009-01-30 11:52:41 UTC (rev 3545)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
 2009-01-30 12:44:02 UTC (rev 3546)
@@ -221,6 +221,7 @@
        public void stopCurrentGadget(){
                if(GadgetsFramework.gadget != null)
                        GadgetsFramework.gadget.abort();
+                       GadgetsFramework.gadget.getGadget().stop();
                        gadget = null;
        }
        

Modified: 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
===================================================================
--- 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
      2009-01-30 11:52:41 UTC (rev 3545)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
      2009-01-30 12:44:02 UTC (rev 3546)
@@ -176,7 +176,14 @@
                {
                        CcCommons.logger.appendError(e.getStackTrace());
                }
-               return Integer.valueOf(pitch).intValue();
+               try
+               {
+                       return Integer.valueOf(pitch).intValue();
+               }
+               catch(NumberFormatException formatError)
+               {
+                       return 120;
+               }
        }
        
        


------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn

Reply via email to