diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-04-04 15:47:07 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-04-04 15:47:07 -0300 |
| commit | d02068a3b9c8b60610ec6b62a7124589b4487148 (patch) | |
| tree | 425d62327bae4043258d2172ce1ffcc90eb87c05 /src | |
| parent | eb329856512b9eb0ea3a7891af42c747837be427 (diff) | |
| parent | 379d13b2b56a50251144c52273aa0352df7c0222 (diff) | |
Merge remote-tracking branch 'chiiph/bug/do_not_do_native_menu_in_linux' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 04a98fac..5abfaa67 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -49,7 +49,7 @@ from leap.bitmask.gui.wizard import Wizard from leap.bitmask.gui.systray import SysTray from leap.bitmask import provider -from leap.bitmask.platform_init import IS_WIN, IS_MAC +from leap.bitmask.platform_init import IS_WIN, IS_MAC, IS_LINUX from leap.bitmask.platform_init.initializers import init_platform from leap.bitmask import backend @@ -157,7 +157,7 @@ class MainWindow(QtGui.QMainWindow): # setup UI self.ui = Ui_MainWindow() self.ui.setupUi(self) - self.menuBar().setNativeMenuBar(True) + self.menuBar().setNativeMenuBar(not IS_LINUX) self._backend = backend.Backend(bypass_checks) self._backend.start() |