From 334839d2d7dc893a6abdef925446191df39c6d62 Mon Sep 17 00:00:00 2001
From: Craig Watson <craig@watsons.ch>
Date: Fri, 23 Sep 2016 18:53:12 -0400
Subject: [PATCH] Desktop mode: don't display on 2nd screen if multiscreen mode
 is deactivated

---
 src/core/UBApplicationController.cpp | 7 +++++++
 src/core/UBDisplayManager.cpp        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp
index 37582e53..04b49ed6 100644
--- a/src/core/UBApplicationController.cpp
+++ b/src/core/UBApplicationController.cpp
@@ -721,6 +721,13 @@ void UBApplicationController::importFile(const QString& pFilePath)
 
 void UBApplicationController::useMultiScreen(bool use)
 {
+    if (use && !mMirror)
+        mMirror = new UBScreenMirror();
+    if (!use && mMirror) {
+        delete mMirror;
+        mMirror = NULL;
+    }
+
     mDisplayManager->setUseMultiScreen(use);
     mDisplayManager->adjustScreens(0);
     UBSettings::settings()->appUseMultiscreen->set(use);
diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp
index 77538458..2d0e418b 100644
--- a/src/core/UBDisplayManager.cpp
+++ b/src/core/UBDisplayManager.cpp
@@ -55,7 +55,7 @@ UBDisplayManager::UBDisplayManager(QObject *parent)
 {
     mDesktop = qApp->desktop();
 
-    mUseMultiScreen = true;
+    mUseMultiScreen = UBSettings::settings()->appUseMultiscreen->get().toBool();
 
     initScreenIndexes();