From f79633b942f2ae5ee844cc4f2e17c0f338e4ba3c Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 17 Jul 2013 06:01:03 +0900 Subject: fix locking for raising window --- src/leap/gui/mainwindow.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/leap/gui') diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index ba546fd0..6ee8b028 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -47,6 +47,7 @@ from leap.services.eip.providerbootstrapper import ProviderBootstrapper from leap.services.mail.smtpbootstrapper import SMTPBootstrapper from leap.platform_init import IS_WIN, IS_MAC from leap.platform_init.initializers import init_platform + from leap.services.eip.vpnprocess import VPN from leap.services.eip.vpnlaunchers import (VPNLauncherException, @@ -60,6 +61,7 @@ from leap.services.mail.smtpconfig import SMTPConfig if IS_WIN: from leap.platform_init.locks import WindowsLock + from leap.platform_init.locks import raise_window_ack from ui_mainwindow import Ui_MainWindow @@ -1284,6 +1286,8 @@ class MainWindow(QtGui.QMainWindow): """ Callback for the raise window event """ + if IS_WIN: + raise_window_ack() self.raise_window.emit() def _do_raise_mainwindow(self): @@ -1309,8 +1313,7 @@ class MainWindow(QtGui.QMainWindow): Triggered after aboutToQuit signal. """ if IS_WIN: - lockfile = WindowsLock() - lockfile.release_lock() + WindowsLock.release_all_locks() def _cleanup_and_quit(self): """ -- cgit v1.2.3