aboutsummaryrefslogtreecommitdiff
path: root/lumina-desktop
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2015-08-20 17:17:18 -0400
committerKen Moore <moorekou@gmail.com>2015-08-20 17:17:18 -0400
commitafcd2ddc0fe012cffe6fa478dbea19c599c32687 (patch)
treeacbfae287a6c8646e36058a51d73298261f62a59 /lumina-desktop
parentAdd an additional option to desktop plugins where additional cleanup routines... (diff)
downloadlumina-afcd2ddc0fe012cffe6fa478dbea19c599c32687.tar.gz
lumina-afcd2ddc0fe012cffe6fa478dbea19c599c32687.tar.bz2
lumina-afcd2ddc0fe012cffe6fa478dbea19c599c32687.zip
Oops, make sure that applauncher/desktop icon check is run before deleting the desktop file (just in case the user simply unchecked the icon generation option).
Diffstat (limited to 'lumina-desktop')
-rw-r--r--lumina-desktop/LDesktop.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index a326cbcb..cc3e8ed5 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -578,7 +578,8 @@ void LDesktop::DesktopPluginRemoved(QString ID, bool internal){
//qDebug() << "- found ID";
if(DEBUG){ qDebug() << " - Deleting Desktop Plugin:" << ID; }
//Special check for auto-generated desktop icons
- if(ID.startsWith("applauncher::") && (ID.section("::",1,1).section("---",0,0).section("/",0,-1) == (QDir::homePath()+"/Desktop") ) ){
+ if(ID.startsWith("applauncher::")){
+ qDebug() << "Desktop Icon Removal:" << !internal;
PLUGINS[i]->removeSettings(!internal); //Only remove the file if an external removal on an auto-generated shortcut
}else{
PLUGINS[i]->removeSettings(true); //Remove any settings associated with this plugin
bgstack15