diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-07-24 15:19:02 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-07-24 15:19:02 -0300 |
commit | faadf8dc3bb1e49adc23c64d5a851b7eea0ce2ee (patch) | |
tree | d1da9b438db9e1c6a2513704ac40bf1132de2223 /src/leap/bitmask/frontend_app.py | |
parent | e7de22a844cef0067946a2af4ec464314cf37e0d (diff) | |
parent | d97a9804c1a6fb06d7ce39066f92a0259a6ab8c3 (diff) |
Merge remote-tracking branch 'refs/remotes/ivan/feature/add-backend-alive-check' into develop
Diffstat (limited to 'src/leap/bitmask/frontend_app.py')
-rw-r--r-- | src/leap/bitmask/frontend_app.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/frontend_app.py b/src/leap/bitmask/frontend_app.py index 51607d0b..5ea89fc9 100644 --- a/src/leap/bitmask/frontend_app.py +++ b/src/leap/bitmask/frontend_app.py @@ -54,7 +54,7 @@ def signal_handler(window, pid, signum, frame): window.quit() -def run_frontend(options, flags_dict): +def run_frontend(options, flags_dict, backend_pid): """ Run the GUI for the application. @@ -102,7 +102,7 @@ def run_frontend(options, flags_dict): timer.start(500) # You may change this if you wish. timer.timeout.connect(lambda: None) # Let the interpreter run each 500 ms. - window = MainWindow(start_hidden=start_hidden) + window = MainWindow(start_hidden=start_hidden, backend_pid=backend_pid) my_pid = os.getpid() sig_handler = partial(signal_handler, window, my_pid) |