diff options
| author | kali <kali@leap.se> | 2012-09-13 16:38:22 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-13 16:38:22 +0900 |
| commit | 71cedd4e4a882765862496d77c7f04173ab4712a (patch) | |
| tree | 9720c39fcd6a68c36a754624a5ced88cd7fdb655 /src/leap/baseapp | |
| parent | df6599be6dcf888b70ca430f7fa2efd8e8ae99d1 (diff) | |
fix race condition on app init
still fragile; sometimes the qt app inits faster and make the send
command miss the not yet created managemente socket.
Diffstat (limited to 'src/leap/baseapp')
| -rw-r--r-- | src/leap/baseapp/eip.py | 9 | ||||
| -rw-r--r-- | src/leap/baseapp/leap_app.py | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py index 515ae58d..68bd2f24 100644 --- a/src/leap/baseapp/eip.py +++ b/src/leap/baseapp/eip.py @@ -151,13 +151,18 @@ class EIPConductorAppMixin(object): # from openvpn manager) if not self.eip_service_started: + # there is a race condition + # going on here. Depending on how long we take + # to init the qt app, the management socket + # is not ready yet. return if self.conductor.with_errors: #XXX how to wait on pkexec??? #something better that this workaround, plz!! - time.sleep(5) - logger.debug('timeout') + #I removed the pkexec pass authentication at all. + #time.sleep(5) + #logger.debug('timeout') logger.error('errors. disconnect') self.start_or_stopVPN() # is stop diff --git a/src/leap/baseapp/leap_app.py b/src/leap/baseapp/leap_app.py index f91b2329..f861f945 100644 --- a/src/leap/baseapp/leap_app.py +++ b/src/leap/baseapp/leap_app.py @@ -45,7 +45,7 @@ class MainWindowMixin(object): self.headerLabelSub = QtGui.QLabel("<i>trust your \ technolust</i>") - pixmap = QtGui.QPixmap(':/images/leapfrog.jpg') + pixmap = QtGui.QPixmap(':/images/leap-color-small.png') frog_lbl = QtGui.QLabel() frog_lbl.setPixmap(pixmap) |