← Back to branch summary

~ubuntu-branches/ubuntu/precise/networkmanagement/precise

« back to all changes in this revision

Viewing changes to libs/service/wirednetworkinterfaceactivatableprovider.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-23 14:00:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20111023140013-e38hdzybcg6zndrk
Tags: 0.9~svngit.nm09.20111023.ff842e-0ubuntu1
* New upstream snapshot.
* Drop all patches, merged upstream.
* Add kubuntu_add_subdirectory_po.diff to build the translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/service/wirednetworkinterfaceactivatableprovider.cpp
85
85
bool WiredNetworkInterfaceActivatableProvider::needsActivatableForUnconfigured() const
86
86
{
87
87
    Q_D(const WiredNetworkInterfaceActivatableProvider);
88
 
    return d->activatables.isEmpty() && d->wiredInterface()->carrier();
 
88
    // wiredInterface() can be null if NetworkManager has just stopped and this provider
 
89
    // has not been unregistered yet.
 
90
    if (d->wiredInterface()) {
 
91
        return d->activatables.isEmpty() && d->wiredInterface()->carrier();
 
92
    }
 
93
    return false;
89
94
}
90
95
 
91
96
// vim: sw=4 sts=4 et tw=100