From 2534acc961e03e87831edd82e55092fb95942e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Sun, 8 May 2011 17:14:45 +0200
Subject: [PATCH] Don't store virtual desktop settings while loading them

fwd-port of a2d4c3ebdf7137f3543c88245f0bfd3dba308ebf
CCBUG: 272666
---
 workspace.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/workspace.cpp b/workspace.cpp
index 251561d597..81c87420ba 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1173,8 +1173,10 @@ void Workspace::slotReinitCompositing()
     }
 }
 
+static bool _loading_desktop_settings = false;
 void Workspace::loadDesktopSettings()
 {
+    _loading_desktop_settings = true;
     KSharedConfig::Ptr c = KGlobal::config();
     QString groupname;
     if (screen_number == 0)
@@ -1189,10 +1191,13 @@ void Workspace::loadDesktopSettings()
         rootInfo->setDesktopName(i, s.toUtf8().data());
         desktop_focus_chain[i-1] = i;
     }
+    _loading_desktop_settings = false;
 }
 
 void Workspace::saveDesktopSettings()
 {
+    if (_loading_desktop_settings)
+        return;
     KSharedConfig::Ptr c = KGlobal::config();
     QString groupname;
     if (screen_number == 0)