* Returns a & and use a & when dealing with EMConverters

* Fix signal getting problems (bzr r3566.6.13)

1 files changed, 3 insertions, 2 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 2ca1a32a5..c9c4fe155 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -894,6 +894,8 @@ void UnityScreen::DrawPanelUnderDash()
 
 nux::TexCoordXForm texxform;
 texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_CLAMP);
+
+ // FIXME Change to paint per monitor vs all at once
 int panel_height = panel_style_.PanelHeight();
 auto const& texture = panel_style_.GetBackground()->GetDeviceTexture();
 graphics_engine->QRP_GLSL_1Tex(0, 0, screen->width(), panel_height, texture, texxform, nux::color::White);
@@ -2868,8 +2870,6 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
 }
 else
 {
- WindowManager& wm = WindowManager::Default();
-
 if (window->id() == active_window)
 {
 draw_panel_shadow = DrawPanelShadow::BELOW_WINDOW;
@@ -2879,6 +2879,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
 !(window->state() & CompWindowStateFullscreenMask) &&
 !(window->type() & CompWindowTypeFullscreenMask))
 {
+ WindowManager& wm = WindowManager::Default();
 auto const& output = uScreen->screen->currentOutputDev();
 int monitor = wm.MonitorGeometryIn(NuxGeometryFromCompRect(output));