Commitd48ab05

authored

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

Backport PR#16311 on branch v3.1.x (don't override non-Python signal handlers)

2 parentsd10aacf +df0e01e commitd48ab05Copy full SHA for d48ab05

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

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

Comments

(0)