Minor changes suggested by Marco's review.

(bzr r3874.1.16)

1 files changed, 9 insertions, 15 deletions

diff --git a/unity-shared/PluginAdapter.cpp b/unity-shared/PluginAdapter.cpp
index 3c7f3d4f0..ea310bb3c 100644
--- a/unity-shared/PluginAdapter.cpp
+++ b/unity-shared/PluginAdapter.cpp
@@ -1457,28 +1457,22 @@ void PluginAdapter::OnWindowClosed(CompWindow *w)
 // XXX Don't use that outside lockscreen controller!
 void PluginAdapter::UnmapAllNoNuxWindowsSync()
 {
- bool one_window_is_mapped = false;
 for (auto const& window : m_Screen->windows())
 {
- if (!IsNuxWindow(window) && window->isMapped())
+ if (!IsNuxWindow(window) && (window->isMapped() || window->isViewable()))
 {
- XUnmapWindow(m_Screen->dpy(), window->id());
- one_window_is_mapped = true;
- }
- }
-
- // Wait!
- while(one_window_is_mapped)
- {
- one_window_is_mapped = false;
- for (auto const& window : m_Screen->windows())
- {
- if (!IsNuxWindow(window) && window->isMapped())
+ if (window->overrideRedirect())
 {
- one_window_is_mapped = true;
+ XUnmapWindow(m_Screen->dpy(), window->id());
+ }
+ else
+ {
+ window->hide();
 }
 }
 }
+
+ XSync(m_Screen->dpy(), False);
 }
 
 bool PluginAdapter::IsNuxWindow(CompWindow* value)