summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorkali <kali@katsi>2014-07-25 11:39:19 -0500
committerkali <kali@katsi>2014-07-25 11:39:19 -0500
commitc4832d322c6ab71edab14643a77d9f1bd099a458 (patch)
tree52717110f5ba4bfefe56ee5c2f0ad9f6ac7cc31e /src/leap/bitmask/gui/mainwindow.py
parent675e4ed10f173088423bf07e3f0ba651cdb8b13c (diff)
parentdbfcb48a5d4d3aee80ed8dd7b20e61994ddbb667 (diff)
Merge tag '0.5.4' into deb-0.5.4
Tag leap.bitmask version 0.5.4
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 8a5b8275..a7e35d15 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -960,6 +960,12 @@ class MainWindow(QtGui.QMainWindow):
if not visible:
QtGui.QApplication.setQuitOnLastWindowClosed(True)
self.show()
+ if IS_LINUX:
+ # On ubuntu, activateWindow doesn't work reliably, so
+ # we do the following as a workaround. See
+ # https://bugreports.qt-project.org/browse/QTBUG-24932
+ # for more details
+ QtGui.QX11Info.setAppUserTime(0)
self.activateWindow()
self.raise_()
else: