hrev47518 adds 1 changeset to branch 'master' old head: 247a35bd0af7f0891aba97d5775761168a551f09 new head: 29c145bcbe26d2806ae1ba74dae8f95d39611ff6 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=29c145b+%5E247a35b ---------------------------------------------------------------------------- 29c145b: Tracker: Check LockLooper() return value. Fixes CID602468 and CID602469 Thanks waddlesplash for pointing this out. [ John Scipione <jscipione@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev47518 Commit: 29c145bcbe26d2806ae1ba74dae8f95d39611ff6 URL: http://cgit.haiku-os.org/haiku/commit/?id=29c145b Author: John Scipione <jscipione@xxxxxxxxx> Date: Fri Jul 18 18:10:38 2014 UTC ---------------------------------------------------------------------------- 1 file changed, 12 insertions(+), 10 deletions(-) src/kits/tracker/DesktopPoseView.cpp | 22 ++++++++++++---------- ---------------------------------------------------------------------------- diff --git a/src/kits/tracker/DesktopPoseView.cpp b/src/kits/tracker/DesktopPoseView.cpp index beaba08..2e259c3 100644 --- a/src/kits/tracker/DesktopPoseView.cpp +++ b/src/kits/tracker/DesktopPoseView.cpp @@ -199,22 +199,24 @@ DesktopPoseView::ShowVolumes(bool visible, bool showShared) void DesktopPoseView::StartSettingsWatch() { - be_app->LockLooper(); - be_app->StartWatching(this, kShowDisksIconChanged); - be_app->StartWatching(this, kVolumesOnDesktopChanged); - be_app->StartWatching(this, kDesktopIntegrationChanged); - be_app->UnlockLooper(); + if (be_app->LockLooper()) { + be_app->StartWatching(this, kShowDisksIconChanged); + be_app->StartWatching(this, kVolumesOnDesktopChanged); + be_app->StartWatching(this, kDesktopIntegrationChanged); + be_app->UnlockLooper(); + } } void DesktopPoseView::StopSettingsWatch() { - be_app->LockLooper(); - be_app->StopWatching(this, kShowDisksIconChanged); - be_app->StopWatching(this, kVolumesOnDesktopChanged); - be_app->StopWatching(this, kDesktopIntegrationChanged); - be_app->UnlockLooper(); + if (be_app->LockLooper()) { + be_app->StopWatching(this, kShowDisksIconChanged); + be_app->StopWatching(this, kVolumesOnDesktopChanged); + be_app->StopWatching(this, kDesktopIntegrationChanged); + be_app->UnlockLooper(); + } }