From 86fc339b032d454469c966066d9b4ca61f844e30 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 22 Nov 2016 14:16:14 -0500
Subject: Oops - NOW the desktop/panel settings-reload will work.

---
 src-qt5/core/libLumina/LDesktopUtils.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src-qt5')

diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp
index 80135ed0..978ce70b 100644
--- a/src-qt5/core/libLumina/LDesktopUtils.cpp
+++ b/src-qt5/core/libLumina/LDesktopUtils.cpp
@@ -271,8 +271,8 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){
   // -- DESKTOP SETTINGS --
   QString deskID = QApplication::primaryScreen()->name();
   //(only works for the primary desktop at the moment)
-  tmp = sysDefaults.filter("desktop-"+deskID);
-  if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."+deskID); }//for backwards compat
+  tmp = sysDefaults.filter("desktop_");
+  if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."); }//for backwards compat
   if(!tmp.isEmpty()){deskset << "[desktop-"+deskID+"]"; }
   for(int i=0; i<tmp.length(); i++){
     if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; }
@@ -294,9 +294,9 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){
   // -- PANEL SETTINGS --
   //(only works for the primary desktop at the moment)
   for(int i=1; i<11; i++){
-    QString panvar = "panel_"+deskID+"."+QString::number(i-1);
+    QString panvar = "panel"+QString::number(i);
     tmp = sysDefaults.filter(panvar);
-    if(!tmp.isEmpty()){deskset << "["+panvar+"]"; }
+    if(!tmp.isEmpty()){deskset << "[panel_"+deskID+"."+QString::number(i-1)+"]"; }
     for(int i=0; i<tmp.length(); i++){
       if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; }
       QString var = tmp[i].section("=",0,0).toLower().simplified();
-- 
cgit