some api fixes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@862 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 7 insertions, 6 deletions

diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 9ab1c57c2..e094f5006 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -156,10 +156,8 @@ void FileDialog::registerBuiltinFactories()
 
 void FileDialog::registerExternalFactories()
 {
-    QDir pluginsDir (qApp->applicationDirPath());
-    pluginsDir.cdUp();
-    pluginsDir.cd("./"LIB_DIR"/qmmp/FileDialogs");
-
+    QDir pluginsDir (Qmmp::pluginsPath());
+    pluginsDir.cd("FileDialogs");
     foreach (QString fileName, pluginsDir.entryList(QDir::Files))
     {
         QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
@@ -208,7 +206,7 @@ FileDialog* FileDialog::instance()
 
     QStringList names = factories.keys();
 
-    if(!names.contains(f_dialogName))
+    if (!names.contains(f_dialogName))
         f_dialogName = "qt_dialog";
 
     if (m_current_factory != f_dialogName || !_instance)
@@ -275,7 +273,10 @@ void FileDialog::popup(QWidget *parent,
     {
         QStringList files;
         if (m == AddFiles || m == AddFile || m == AddDirsFiles)
-            files = getOpenFileNames(parent, caption, *dir, filters);
+        {
+            QString selectedFilter;
+            files = getOpenFileNames(parent, caption, *dir, filters, &selectedFilter);
+        }
         else if (m == AddDirs || m == AddDir)
         {
             QString path = getExistingDirectory(parent, caption, *dir);