commit 56ec3f036a96143860c42fa41ed31d90df455a81
author Linux Build Service Account <lnxbuild@localhost> Tue Nov 18 11:30:15 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 18 11:30:15 2014 -0800
tree 527b830e9736961d7b3b9c55b07af8d61c59d593
parent 69ca731c024a70936b4282631c7c0b53f6c1d947
parent 7cd67782002e38c040cb5d6c3edbd466d17f8fc0

Merge "overlay: Reset display and mixer tags for unallocated pipes"

liboverlay/overlay.cpp

diff --git a/liboverlay/overlay.cpp b/liboverlay/overlay.cpp
index 3a96b71..9320848 100644
--- a/liboverlay/overlay.cpp
+++ b/liboverlay/overlay.cpp
@@ -313,13 +313,7 @@
         ret = true;
         PipeBook::setUse((int)dest);
     } else {
-        int dpy = mPipeBook[dest].mDisplay;
-        for(int i = 0; i < PipeBook::NUM_PIPES; i++) {
-            if (mPipeBook[i].mDisplay == dpy) {
-                PipeBook::resetAllocation(i);
-                PipeBook::resetUse(i);
-            }
-        }
+        clear(mPipeBook[dest].mDisplay);
     }
     return ret;
 }
@@ -529,6 +523,9 @@
             // Mark as available for this round
             PipeBook::resetUse(i);
             PipeBook::resetAllocation(i);
+            if(getPipeId((utils::eDest)i) == -1) {
+                mPipeBook[i].destroy();
+            }
         }
     }
 }