Ticket #577: diff-bug-snd_mgr-20-03-2011.patch

source/lib/res/sound/snd_mgr.cpp

@@ -1784 +1784 @@
     // note: vs->hsd is valid, otherwise snd_open would have failed
     // and returned an invalid handle (caught above).
 
+    // optimization (don't want to do full update here - too slow)
+    // either we get a source and playing begins immediately,
+    // or it'll be taken care of on next update.
+    if (vsrc_grant(vs) != INFO::OK)
+    {
+        return ERR::FAIL;
+    }
     vs->static_pri = static_pri;
     list_add(vs);
     vs->flags |= VS_IN_LIST;
-
-    // optimization (don't want to do full update here - too slow)
-    // either we get a source and playing begins immediately,
-    // or it'll be taken care of on next update.
-    vsrc_grant(vs);
     return INFO::OK;
 }
 

source/lib/res/h_mgr.cpp

@@ -654 +654 @@
             return INFO::OK;
         // this was a valid handle but was probably freed in the meantime.
         // complain because this probably indicates a bug somewhere.
-        WARN_RETURN(ERR::INVALID_HANDLE);
+        //WARN_RETURN(ERR::INVALID_HANDLE);
+        return INFO::OK;
     }
 
     return h_free_idx(idx, hd);