diff options
| author | Ken Moore <ken@ixsystems.com> | 2018-09-06 17:59:57 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2018-09-06 17:59:57 -0400 |
| commit | f1fce23e23d0a61ce588c5c089792a1e71dc0500 (patch) | |
| tree | dd8fc110244fc6396f3a930ea4d0f7e022956f3f /src-qt5/src-cpp | |
| parent | Checkpoint commit for some uncommitted changed to lumina-desktop-unified (diff) | |
| download | lumina-f1fce23e23d0a61ce588c5c089792a1e71dc0500.tar.gz lumina-f1fce23e23d0a61ce588c5c089792a1e71dc0500.tar.bz2 lumina-f1fce23e23d0a61ce588c5c089792a1e71dc0500.zip | |
Fix up the launching of the desktop session
1. Clear out the lockfiles for a session before launching it
2. Provide some mechanisms for returning lockfile paths without creating a new single-instance session.
3. A couple other random commits I still had staged on my laptop (settings menu tweak)
Diffstat (limited to 'src-qt5/src-cpp')
| -rw-r--r-- | src-qt5/src-cpp/framework-OSInterface_private.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src-qt5/src-cpp/framework-OSInterface_private.cpp b/src-qt5/src-cpp/framework-OSInterface_private.cpp index b0a22b1d..a15626e9 100644 --- a/src-qt5/src-cpp/framework-OSInterface_private.cpp +++ b/src-qt5/src-cpp/framework-OSInterface_private.cpp @@ -305,6 +305,7 @@ void OSInterface::syncNetworkInfo(OSInterface *os, QHash<QString, QVariant> *has bool ok = false; for(int j=0; j<addressList.length() && !ok; j++){ if( addressList[j].ip().isLoopback() ){ continue; } + else if(addressList[i].ip().isEqual(QHostAddress(QHostAddress::LocalHost)) || addressList[i].ip().isEqual(QHostAddress::LocalHostIPv6) ){ continue; } addressList[j].ip().toIPv4Address(&ok); } if(ok){ active = netconfigL[i]; break; } //found a good one with a valid IPv4 |