summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-12-07 14:56:00 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2016-12-07 14:58:25 +0100
commit26cb63774014d896413c1355ff7a25fc9869da72 (patch)
tree9c87a35d0cbf3b4742f00af838df24954d2282f4
parent758595e34038148b0f4b48e803aaf5588efd40f2 (diff)
[bug] always set verbose flag for bundles
-rw-r--r--src/leap/bitmask/core/launcher.py2
-rw-r--r--src/leap/bitmask/gui/app.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/bitmask/core/launcher.py b/src/leap/bitmask/core/launcher.py
index 5b76b68..a1c8690 100644
--- a/src/leap/bitmask/core/launcher.py
+++ b/src/leap/bitmask/core/launcher.py
@@ -52,6 +52,8 @@ def run_bitmaskd():
flags.BACKEND = sys.argv[index + 1]
elif arg == '--verbose' or arg == '-v':
flags.VERBOSE = True
+ if STANDALONE:
+ flags.VERBOSE = True
args = [
'-y', join(here(core), "bitmaskd.tac"),
'--logfile', getLogPath(),
diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py
index b2343a6..ce9fc88 100644
--- a/src/leap/bitmask/gui/app.py
+++ b/src/leap/bitmask/gui/app.py
@@ -92,8 +92,8 @@ class BrowserWindow(QDialog):
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/mask-icon.png"),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.setWindowIcon(icon)
+ QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.setWindowIcon(icon)
self.setWindowTitle('Bitmask')
self.load_app()