From e85f80eedf74b24b895c03d6ac64b080c3f65acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 16 May 2009 22:48:45 +0000 Subject: [PATCH] * So many style violations in so few lines of code... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30775 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/disk_device_manager/KDiskDeviceManager.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp b/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp index 2b056ef187..0d8b256ab6 100644 --- a/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp +++ b/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp @@ -1469,12 +1469,10 @@ KDiskDeviceManager::_CheckMediaStatus() bool changedMedia = device->MediaChanged(); device->UpdateMediaStatusIfNeeded(); - // Detect it there was any status change since last check. - bool updated = (hadMedia != device->HasMedia()) || - (changedMedia != device->MediaChanged()); - - if ((!device->MediaChanged() && - (device->HasMedia() || !hadMedia)) || !updated) + // Detect if there was any status change since last check. + if ((!device->MediaChanged() && (device->HasMedia() || !hadMedia)) + || !(hadMedia != device->HasMedia() + || changedMedia != device->MediaChanged())) continue; device->MarkBusy(true);