Fixed pager background loading failure on inactive desktop and high CPU usage on Desktop 1

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1108873 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 5 deletions

diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index 1ecfcca43..cb41bb04c 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -198,6 +198,8 @@ QPixmap fastScalePixmap(const QPixmap &pixmap, int width, int height)
 
 void Desktop::loadBgPixmap(void)
 {
+  bool retval;
+
 //  if (!m_bgDirty) return;
   DCOPClient *client = kapp->dcopClient();
   if (!client->isAttached())
@@ -252,17 +254,19 @@ void Desktop::loadBgPixmap(void)
   kdDebug() << "getting whole bg through shpixmap\n";
  */
 
-  QDataStream args( data, IO_WriteOnly );
-  args << 1;
-  client->send( "kdesktop", "KBackgroundIface", "setExport(int)", data );
-
   if (!m_bgPixmap)
   {
      m_bgPixmap = new KSharedPixmap;
      connect(m_bgPixmap, SIGNAL(done(bool)), SLOT(backgroundLoaded(bool)));
   }
 
-  m_bgPixmap->loadFromShared(QString("DESKTOP%1").arg(m_isCommon?1:m_desk));
+  retval = m_bgPixmap->loadFromShared(QString("DESKTOP%1").arg(m_isCommon?1:m_desk));
+  if (retval == false) {
+    QDataStream args( data, IO_WriteOnly );
+    args << 1;	// Argument is 1 (true)
+    client->send("kdesktop", "KBackgroundIface", "setExport(int)", data);
+    retval = m_bgPixmap->loadFromShared(QString("DESKTOP%1").arg(m_isCommon?1:m_desk));
+  }
 
 }