i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

launch_media_server: correctly handle media services start

Browse Source 
* Handle when the media_addon_server is not
  running.
* Fix #5621.
This commit is contained in:
Dario Casalinuovo
2015-07-24 12:19:31 +02:00
parent 67483edabd
commit 41f5b3fc35
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/MediaDefs.cpp
+10 -4
View File
@@ -13,6 +13,7 @@
#include <MediaDefs.h> #include <MediaDefs.h>
#include <MediaNode.h> #include <MediaNode.h>
#include <MediaRoster.h>
#include <Roster.h> #include <Roster.h>
#include "debug.h" #include "debug.h"
@@ -1287,17 +1288,22 @@ shutdown_media_server(bigtime_t timeout,
status_t status_t
launch_media_server(uint32 flags) launch_media_server(uint32 flags)
{ {
status_t err; if (BMediaRoster::IsRunning())
if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE))
return B_ALREADY_RUNNING; return B_ALREADY_RUNNING;
// The media_server crashed
if (be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) { if (be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) {
kill_team(be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE)); kill_team(be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE));
snooze(1000000); snooze(1000000);
} }
err = be_roster->Launch(B_MEDIA_SERVER_SIGNATURE); // The media_addon_server crashed
if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)) {
kill_team(be_roster->TeamFor(B_MEDIA_SERVER_SIGNATURE));
snooze(1000000);
}
status_t err = be_roster->Launch(B_MEDIA_SERVER_SIGNATURE);
if (err != B_OK) if (err != B_OK)
return err; return err;