Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix plugin load

Browse Source 
Change-Id: I2c6f7d842462a80bfec1ae16f36b8d1b67782e6c
This commit is contained in:
石博文 2016-06-24 15:47:35 +08:00 committed by Hualet Wang
parent 6cf703deec
commit 8bb4dfe627
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frame/controller/dockpluginscontroller.cpp
View File

@ -45,6 +45,7 @@ void DockPluginsController::loadPlugins()
PluginsItemInterface *interface = qobject_cast<PluginsItemInterface *>(pluginLoader->instance()); PluginsItemInterface *interface = qobject_cast<PluginsItemInterface *>(pluginLoader->instance());
if (!interface) if (!interface)
{ {
pluginLoader->unload();
pluginLoader->deleteLater(); pluginLoader->deleteLater();
continue; continue;
} }

5
frame/main.cpp
View File

@ -2,6 +2,7 @@
#include "window/mainwindow.h" #include "window/mainwindow.h"
#include <dapplication.h> #include <dapplication.h>
#include <QDir>
#include <unistd.h> #include <unistd.h>
@ -36,6 +37,10 @@ int main(int argc, char *argv[])
app.setApplicationDisplayName("DDE Dock"); app.setApplicationDisplayName("DDE Dock");
app.setApplicationVersion("2.0"); app.setApplicationVersion("2.0");
#ifndef QT_DEBUG
QDir::setCurrent(QApplication::applicationDirPath());
#endif
MainWindow mw; MainWindow mw;
QDBusConnection::sessionBus().registerService("com.deepin.dde.dock"); QDBusConnection::sessionBus().registerService("com.deepin.dde.dock");
QDBusConnection::sessionBus().registerObject("/com/deepin/dde/dock", "com.deepin.dde.dock", &mw); QDBusConnection::sessionBus().registerObject("/com/deepin/dde/dock", "com.deepin.dde.dock", &mw);