From 6600034c831caa321ac03f305896915d914ca1a5 Mon Sep 17 00:00:00 2001
From: Aleksei Kanash <sc.kanash.aleksei@gmail.com>
Date: Mon, 20 Feb 2012 17:35:52 +0200
Subject: [PATCH] Addition to SANKORE-297.

---
 src/core/UBDisplayManager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp
index b73816e8..0bf822d8 100644
--- a/src/core/UBDisplayManager.cpp
+++ b/src/core/UBDisplayManager.cpp
@@ -135,7 +135,7 @@ void UBDisplayManager::setAsControl(QWidget* pControlWidget )
 
 void UBDisplayManager::setAsDesktop(QWidget* pControlWidget )
 {
-    if(hasControl() && pControlWidget && (pControlWidget != mControlWidget))
+    if(pControlWidget && (pControlWidget != mControlWidget))
     {
         mDesktopWidget = pControlWidget;
         mDesktopWidget->hide();
@@ -150,7 +150,7 @@ void UBDisplayManager::setAsDesktop(QWidget* pControlWidget )
 
 void UBDisplayManager::setAsDisplay(QWidget* pDisplayWidget)
 {
-    if(hasDisplay() && pDisplayWidget && (pDisplayWidget != mDisplayWidget))
+    if(pDisplayWidget && (pDisplayWidget != mDisplayWidget))
     {
         mDisplayWidget = pDisplayWidget;
         mDisplayWidget->hide();
@@ -203,16 +203,19 @@ void UBDisplayManager::positionScreens()
 
     if(mDesktopWidget && mControlScreenIndex > -1)
     {
+        mDesktopWidget->hide();
         mDesktopWidget->setGeometry(mDesktop->screenGeometry(mControlScreenIndex));
     }
     if (mControlWidget && mControlScreenIndex > -1)
     {
+        mControlWidget->hide();
         mControlWidget->setGeometry(mDesktop->screenGeometry(mControlScreenIndex));
         mControlWidget->showFullScreen();
     }
 
     if (mDisplayWidget && mDisplayScreenIndex > -1)
     {
+        mDisplayWidget->hide();
         mDisplayWidget->setGeometry(mDesktop->screenGeometry(mDisplayScreenIndex));
         mDisplayWidget->showFullScreen();
     }