Fix for TIVI-3061 - WIFI sometimes can't be turned on/off

Change-Id: I79f0cf4e120a110ba74dccb97f65315684952d9e
Signed-off-by: brianjjones <brian.j.jones@intel.com>

diff --git a/css/car/components/settings/js/websocket.js b/css/car/components/settings/js/websocket.js
index 33e06db..f4ba9d8 100644 (file)
--- a/css/car/components/settings/js/websocket.js
+++ b/css/car/components/settings/js/websocket.js
@@ -149,6 +149,8 @@ var wsAPI = (function() {
                if (!this.connected) {
                        if (error_cb !== undefined) {
                                error_cb(ERROR_SETTINGSD_DISCONNECTED);
+                               //Attempt to reconnect to settings-daemon
+                               reconnect();
                        }
                        return;
                }
@@ -559,4 +561,4 @@ var wsAPI = (function() {
                subscribeEvents : subscribeEvents,
                unsubscribeEvents : unsubscribeEvents
        }
-})();
\ No newline at end of file
+})();

diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes
index 9dfdd8b..5bfcd44 100644 (file)
--- a/packaging/modello-common.changes
+++ b/packaging/modello-common.changes
@@ -1,7 +1,9 @@
+* Wed Apr 23 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140417.181410@01a5441
+- Fix for TIVI-3061 - WIFI sometimes can't be turned on/off
+
 * Mon Apr 14 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140404.163702@b99f3c5
 - Pairing fixes and fixing images
 - Changing file names
-- Initial commit of the common code for the Modello UI
 
 * Thu Apr 03 2014 brianjjones <brian.j.jones@intel.com> 26c776b
 - Initial commit of the common code for the Modello UI