X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.cpp;h=dc8e5c181a41f6f08ff582c559b202f36a6bdd8c;hp=1023efb000a952ac47d367b0e7a11d73a3020e07;hb=165298e0c0ef4666ed9c29f529e35fb4a37913ce;hpb=ecf8f2f28aad5f0f7969bc2da71a6474d7b1646c diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp index 1023efb0..dc8e5c18 100644 --- a/src/client/clientsettings.cpp +++ b/src/client/clientsettings.cpp @@ -249,12 +249,10 @@ void CoreConnectionSettings::setNetworkDetectionMode(NetworkDetectionMode mode) CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettings::networkDetectionMode() { -#ifdef HAVE_KDE4 - NetworkDetectionMode def = UseSolid; -#else - NetworkDetectionMode def = UseQNetworkConfigurationManager; -#endif - return (NetworkDetectionMode)localValue("NetworkDetectionMode", def).toInt(); + auto mode = localValue("NetworkDetectionMode", UseQNetworkConfigurationManager).toInt(); + if (mode == 0) + mode = UseQNetworkConfigurationManager; // UseSolid is gone, map that to the new default + return static_cast(mode); }