Ticket #7135: mediamonitor-unix.cpp-svn-diff

File mediamonitor-unix.cpp-svn-diff, 769 bytes (added by Bill Meek <llibkeem@…>, 16 years ago)

Patch as modified per mdean's request.

Line 
1Index: mediamonitor-unix.cpp
2===================================================================
3--- mediamonitor-unix.cpp (revision 22760)
4+++ mediamonitor-unix.cpp (working copy)
5@@ -232,6 +232,8 @@
6 if (!udevinfo->waitForStarted(2000 /*ms*/))
7 {
8 VERBOSE(VB_MEDIA, msg + ", Error - udevinfo failed to start!");
9+ udevinfo->kill();
10+ udevinfo->waitForFinished(2000 /*ms*/);
11 udevinfo->deleteLater();
12 return ret;
13 }
14@@ -241,6 +243,8 @@
15 VERBOSE(VB_MEDIA,
16 msg + ", Error - udevinfo failed to end! Terminating");
17 udevinfo->kill();
18+ // Wait for the process to die.
19+ udevinfo->waitForFinished(2000 /*ms*/);
20 udevinfo->deleteLater();
21 return ret;
22 }