Changeset 711481177da708b723664b1e4dafaad8307f49d6
- Timestamp:
- 02/23/08 22:34:48
(7 months ago)
- Author:
- Pierre d'Herbemont <pdherbemont@videolan.org>
- git-committer:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1203802488 +0000
- git-parent:
[b026a42b75599d9cce82bca15302e2831c24c910]
- git-author:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1203802488 +0000
- Message:
vlc.c: Attempt to kill VLC again if Ctrl-C is hit again when the abort timeout is ellapsed. It allows to abort VLC after the first abort timeout.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rb026a42 |
r7114811 |
|
| 275 | 275 | |
|---|
| 276 | 276 | pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); |
|---|
| 277 | | if (abort_time == 0 |
|---|
| | 277 | if (abort_time == 0 || time (NULL) > abort_time) |
|---|
| 278 | 278 | { |
|---|
| 279 | 279 | time (&abort_time); |
|---|
| … | … | |
| 281 | 281 | |
|---|
| 282 | 282 | fprintf (stderr, "signal %d received, terminating vlc - do it " |
|---|
| 283 | | "again |
|---|
| | 283 | "again quickly in case it gets stuck\n", i_signal); |
|---|
| 284 | 284 | |
|---|
| 285 | 285 | /* Acknowledge the signal received */ |
|---|
| 286 | 286 | Kill (); |
|---|
| 287 | 287 | } |
|---|
| 288 | | else |
|---|
| 289 | | if (time (NULL) <= abort_time) |
|---|
| | 288 | else /* time (NULL) <= abort_time */ |
|---|
| 290 | 289 | { |
|---|
| 291 | 290 | /* If user asks again more than 2 seconds later, die badly */ |
|---|
