Commit37163f6

authored

Merge pull request#16356 from meeseeksmachine/auto-backport-of-pr-16330-on-v3.1.x

Backport PR#16330 on branch v3.1.x (Clearer signal handling)

2 parentsf98a87e +a01ca17 commit37163f6Copy full SHA for 37163f6

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1092,11 +1092,12 @@ def trigger_manager_draw(manager):`
`1092`	`1092`	`defmainloop():`
`1093`	`1093`	`old_signal=signal.getsignal(signal.SIGINT)`
`1094`	`1094`	`# allow SIGINT exceptions to close the plot window.`
`1095`		`-ifold_signal:`
	`1095`	`+is_python_signal_handler=old_signalisnotNone`
	`1096`	`+ifis_python_signal_handler:`
`1096`	`1097`	`signal.signal(signal.SIGINT,signal.SIG_DFL)`
`1097`	`1098`	`try:`
`1098`	`1099`	`qApp.exec_()`
`1099`	`1100`	`finally:`
`1100`	`1101`	`# reset the SIGINT exception handler`
`1101`		`-ifold_signal:`
	`1102`	`+ifis_python_signal_handler:`
`1102`	`1103`	`signal.signal(signal.SIGINT,old_signal)`

Comments

(0)