← Back to branch summary

~indicator-applet-developers/indicator-network/trunk.14.10

« back to all changes in this revision

Viewing changes to src/indicator/modem-manager.cpp

  • Committer: Antti Kaijanmäki
  • Date: 2014-10-15 11:31:13 UTC
  • mto: This revision was merged to the branch mainline in revision 450.
  • Revision ID: antti.kaijanmaki@canonical.com-20141015113113-z572mjia1stpyphy
deadlock if calling unlock() inside ready signal for a modem that does not require unlocking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/indicator/modem-manager.cpp
71
71
            if (!m_pendingUnlocks.empty()) {
72
72
                auto modem = m_pendingUnlocks.front();
73
73
                m_pendingUnlocks.pop_front();
74
 
                m_unlockDialog->unlock(modem);
 
74
                if (modem->requiredPin().get() != Modem::PinType::none)
 
75
                    m_unlockDialog->unlock(modem);
75
76
            }
76
77
        });
77
78