diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-03 15:01:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-03 15:01:46 -0700 |
| commit | 41e1a272e6794feb4d58fed9807d409bd1930c01 (patch) | |
| tree | d254831fe61361eb52d1b6176873ca547ef32786 /grc/gui | |
| parent | e776f1e7196a7543de240b88005b26a02a4c87af (diff) | |
| parent | f9dd0a8a347e97e08bc7644f0467e58dcaf1ca66 (diff) | |
Merge branch 'next' into python3
Conflicts:
grc/core/Param.py
grc/gui/Application.py
grc/gui/NotebookPage.py
Diffstat (limited to 'grc/gui')
| -rw-r--r-- | grc/gui/Application.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/grc/gui/Application.py b/grc/gui/Application.py index b4df4d172e..458210a3f4 100644 --- a/grc/gui/Application.py +++ b/grc/gui/Application.py @@ -703,9 +703,10 @@ class Application(Gtk.Application): elif action == Actions.FLOW_GRAPH_KILL: if page.process: try: - page.process.kill() + page.term_proc() except: - print("could not kill process: %d" % page.process.pid) + print("could not terminate process: %d" % page.get_proc().pid) + elif action == Actions.PAGE_CHANGE: # pass and run the global actions pass elif action == Actions.RELOAD_BLOCKS: |