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

MediaRoster: Use messaging instead to call Quit on exit

Browse Source 
* As far as the bebook states loopers shouldn't be quit from
other threads, using a B_QUIT_REQUESTED message should be more
safe.
This commit is contained in:
Dario Casalinuovo
2016-11-14 19:21:58 +01:00
parent 25fa3b1b8a
commit ad7255c892
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/MediaRoster.cpp
+9 -3
View File
@@ -119,8 +119,7 @@ public:
~MediaRosterUndertaker() ~MediaRosterUndertaker()
{ {
BAutolock _(sInitLocker); BAutolock _(sInitLocker);
if (BMediaRoster::CurrentRoster() != NULL if (BMediaRoster::CurrentRoster() != NULL) {
&& BMediaRoster::CurrentRoster()->Lock()) {
// Detect any forgotten node // Detect any forgotten node
if (sRegisteredNodes.CountItems() > 0) { if (sRegisteredNodes.CountItems() > 0) {
@@ -137,7 +136,14 @@ public:
if (be_app != NULL) if (be_app != NULL)
be_app->UnregisterLooper(BMediaRoster::CurrentRoster()); be_app->UnregisterLooper(BMediaRoster::CurrentRoster());
BMediaRoster::CurrentRoster()->Quit(); status_t err = B_ERROR;
thread_id roster = BMediaRoster::CurrentRoster()->Thread();
BMediaRoster::CurrentRoster()->PostMessage(B_QUIT_REQUESTED);
wait_for_thread(roster, &err);
if (err != B_OK)
ERROR("BMediaRoster: wait_for_thread returned error");
} }
} }
}; };