Merge pull request #233 from robojumper/arc-dvd-ret-cleanups

Small status/result cleanups for arc managers

1 files changed, 6 insertions, 7 deletions

diff --git a/src/d/d_sc_title.cpp b/src/d/d_sc_title.cpp
index 73e578d7..91cede66 100644
--- a/src/d/d_sc_title.cpp
+++ b/src/d/d_sc_title.cpp
@@ -112,32 +112,31 @@ int dScTitle_c::execute() {
 }
 
 int dScTitle_c::doDelete() {
-    // TODO return codes
     int result;
     result = LayoutArcManager::GetInstance()->ensureLoaded2(sFileSelect);
-    if (result != -2) {
-        if (result != 0) {
+    if (result != D_ARC_RESULT_ERROR_NOT_FOUND) {
+        if (result != D_ARC_RESULT_OK) {
             return NOT_READY;
         }
         LayoutArcManager::GetInstance()->decrement(sFileSelect);
     }
 
     result = LayoutArcManager::GetInstance()->ensureLoaded2(sSkb);
-    if (result != -2) {
-        if (result != 0) {
+    if (result != D_ARC_RESULT_ERROR_NOT_FOUND) {
+        if (result != D_ARC_RESULT_OK) {
             return NOT_READY;
         }
         LayoutArcManager::GetInstance()->decrement(sSkb);
     }
 
     // TODO here's the other half of the ::destroy fakematch...
-    if (mpSkbArc->mStatus != 0) {
+    if (mpSkbArc->isDone()) {
         mDvd_command_c::destroy((mDvd_command_c **)&mpSkbArc);
     } else {
         return NOT_READY;
     }
 
-    if (mpSkbFont->mStatus != 0) {
+    if (mpSkbFont->isDone()) {
         mDvd_command_c::destroy((mDvd_command_c **)&mpSkbFont);
     } else {
         return NOT_READY;