Merge branch 'jb38937' into 'master'

Set delayedTethering to false when clearing tetheringWifiTech pointer See merge request !4
sailfishos · Jun 12, 2017 · 1a440e5 · 1a440e5
2 parents 3ba10b0 + 944086b
commit 1a440e5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -1,9 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Jolla Ltd
+** Copyright (C) 2014-2017 Jolla Ltd
 ** Contact: lorn.potter@gmail.com
 **
-**
 ** GNU Lesser General Public License Usage
 ** This file may be used under the terms of the GNU Lesser
 ** General Public License version 2.1 as published by the Free Software
@@ -484,6 +483,7 @@ void QConnectionAgent::techChanged()
         knownTechnologies.clear();
     }
     if (!netman->getTechnology("wifi")) {
+        delayedTethering = false;
         tetheringWifiTech = 0;
         return;
     }