Repository navigation
Commit 5c1e8db
committed
fix(linux): keep a user Stop out of the "stopped unexpectedly" toast
When the helper exited with an error after the user pressed Stop, the
salvaged take was marked interrupted and the editor opened with "The
screen capture stopped unexpectedly". Only a helper that dies before a
stop is requested now marks the take interrupted; a failed user Stop
keeps its salvaged take without that warning, and a Stop with nothing
usable fails with the helper's reason as before.
Refs #1573
(cherry picked from commit 8074c03)1 parent 59aaca3 commit 5c1e8db
3 files changed
Lines changed: 37 additions & 1 deletion
File tree
- electron
- ipc
- native-bridge/capture
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3009 | 3009 | | |
3010 | 3010 | | |
3011 | 3011 | | |
| 3012 | + | |
| 3013 | + | |
| 3014 | + | |
| 3015 | + | |
3012 | 3016 | | |
3013 | 3017 | | |
3014 | 3018 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
897 | 897 | | |
898 | 898 | | |
899 | 899 | | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
900 | 923 | | |
901 | 924 | | |
902 | 925 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
| 135 | + | |
135 | 136 | | |
136 | 137 | | |
137 | 138 | | |
| |||
232 | 233 | | |
233 | 234 | | |
234 | 235 | | |
| 236 | + | |
235 | 237 | | |
236 | 238 | | |
237 | 239 | | |
| |||
521 | 523 | | |
522 | 524 | | |
523 | 525 | | |
524 | | - | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
525 | 529 | | |
526 | 530 | | |
527 | 531 | | |
528 | 532 | | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
529 | 538 | | |
530 | 539 | | |
531 | 540 | | |
| |||
0 commit comments