From 8bb4dfe62716f61509d009b4054a3b8d7d40917f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= <sbw@sbw.so>
Date: Fri, 24 Jun 2016 15:47:35 +0800
Subject: [PATCH] fix plugin load

Change-Id: I2c6f7d842462a80bfec1ae16f36b8d1b67782e6c
---
 frame/controller/dockpluginscontroller.cpp | 1 +
 frame/main.cpp                             | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp
index 09f92902b..b469bf01f 100644
--- a/frame/controller/dockpluginscontroller.cpp
+++ b/frame/controller/dockpluginscontroller.cpp
@@ -45,6 +45,7 @@ void DockPluginsController::loadPlugins()
         PluginsItemInterface *interface = qobject_cast<PluginsItemInterface *>(pluginLoader->instance());
         if (!interface)
         {
+            pluginLoader->unload();
             pluginLoader->deleteLater();
             continue;
         }
diff --git a/frame/main.cpp b/frame/main.cpp
index 90a03a106..9b8cfa4c9 100644
--- a/frame/main.cpp
+++ b/frame/main.cpp
@@ -2,6 +2,7 @@
 #include "window/mainwindow.h"
 
 #include <dapplication.h>
+#include <QDir>
 
 #include <unistd.h>
 
@@ -36,6 +37,10 @@ int main(int argc, char *argv[])
     app.setApplicationDisplayName("DDE Dock");
     app.setApplicationVersion("2.0");
 
+#ifndef QT_DEBUG
+    QDir::setCurrent(QApplication::applicationDirPath());
+#endif
+
     MainWindow mw;
     QDBusConnection::sessionBus().registerService("com.deepin.dde.dock");
     QDBusConnection::sessionBus().registerObject("/com/deepin/dde/dock", "com.deepin.dde.dock", &mw);