Merge branch 'stable' into dev

* stable: (28 commits)
  Doc: Document support services for Yocto recipes
  doc: minor changes to customization inline code blocks
  Doc: Clarify which Qt Creator templates work out of the box
  Doc: Fix missing sudo for i.MX6 embedded Linux deployment
  Doc: Fixed 32bit package install command for newer ubuntu versions
  doc: add quide how to use b2qt_build_scripts
  Doc: Add instructions how to install newer VirtualBox
  [Wifi] Fix initialization code
  Doc: Explain about disabling surfaceflinger
  Enable internet on eAndroid emulator
  Doc: Add instructions for building Boot2Qt demos
  Doc: Troubleshooting entry for BeagleBone Black HDMI issues
  Don't use wifi on Emulator
  Doc: Document building your own embedded linux stack
  Update copyright year
  Doc: Fix the 2.0 release date
  Doc: ChangeLog: Remove 'black screen after exit' from bugfixes
  Doc: Use a global Qt documentation template
  Doc: Add changelog
  Disable QConnectivity daemon on emulator
  ...

Change-Id: Id524cd8897915b6762210ddece159731c1ef2e67

1 files changed, 12 insertions, 12 deletions

diff --git a/src/imports/wifi/qwifimanager.cpp b/src/imports/wifi/qwifimanager.cpp
index 9139242..7d6683b 100644
--- a/src/imports/wifi/qwifimanager.cpp
+++ b/src/imports/wifi/qwifimanager.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/
@@ -142,19 +142,19 @@ QWifiManager::QWifiManager()
     } else {
         qWarning() << "QWifiManager: failed to connect to qconnectivity socket";
     }
-
     // check if backend has already been initialized
     char backend_status[PROPERTY_VALUE_MAX];
-    if (property_get(QT_WIFI_BACKEND, backend_status, NULL)
-            && strcmp(backend_status, "running") == 0) {
-        // let it re-connect, in most cases this will see that everything is working properly
-        // and will do nothing. Special case is when process has crashed or was killed by a system
-        // signal in previous execution, which results in broken connection to a supplicant,
-        // connectToBackend will fix it..
-        connectToBackend();
-    } else {
-        // same here, cleans up the state
-        disconnectFromBackend();
+    if (property_get(QT_WIFI_BACKEND, backend_status, NULL)) {
+        if (strcmp(backend_status, "running") == 0) {
+            // let it re-connect, in most cases this will see that everything is working properly
+            // and will do nothing. Special case is when process has crashed or was killed by a system
+            // signal in previous execution, which results in broken connection to a supplicant,
+            // connectToBackend will fix it..
+            connectToBackend();
+        } else if (strcmp(backend_status, "stopped") == 0) {
+            // same here, cleans up the state
+            disconnectFromBackend();
+        }
     }
 }