aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop/SettingsMenu.cpp
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2016-09-23 08:47:32 +0000
committerWeblate <noreply@weblate.org>2016-09-23 08:47:32 +0000
commit3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b (patch)
tree05aac860fdec6f1af2332bbf128a2bac7f27f02b /src-qt5/core/lumina-desktop/SettingsMenu.cpp
parentTranslated using Weblate (l_TERMINAL@sv (generated)) (diff)
parentTranslated using Weblate (lumina_WM@lt (generated)) (diff)
downloadlumina-3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b.tar.gz
lumina-3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b.tar.bz2
lumina-3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop/SettingsMenu.cpp')
-rw-r--r--src-qt5/core/lumina-desktop/SettingsMenu.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop/SettingsMenu.cpp b/src-qt5/core/lumina-desktop/SettingsMenu.cpp
index 10ada2cf..80ef3042 100644
--- a/src-qt5/core/lumina-desktop/SettingsMenu.cpp
+++ b/src-qt5/core/lumina-desktop/SettingsMenu.cpp
@@ -45,9 +45,8 @@ void SettingsMenu::UpdateMenu(){
QString CONTROLPANEL = LOS::ControlPanelShortcut();
if(QFile::exists(CONTROLPANEL) && !CONTROLPANEL.isEmpty()){
//Now load the info
- bool ok = false;
- XDGDesktop cpan = LXDG::loadDesktopFile(CONTROLPANEL, ok);
- if(ok){
+ XDGDesktop cpan(CONTROLPANEL);
+ if(cpan.isValid()){
act = new QAction( LXDG::findIcon(cpan.icon,""), tr("Control Panel"), this);
act->setWhatsThis("lumina-open \""+CONTROLPANEL+"\"");
this->addAction(act);
bgstack15