Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-11 09:24:50 +01:00
Code Issues Releases Wiki Activity

Merge pull request #5073 from electric-indigo/revert-4984-master

Browse Source 
Revert "Workaround for malfunctioning "Show in file browser" feature …
This commit is contained in:
John Maguire 2015-10-12 12:34:45 +01:00
commit fd7843bdae
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/utilities.cpp
View File

@ -38,7 +38,6 @@
#include <QIODevice> #include <QIODevice>
#include <QMetaEnum> #include <QMetaEnum>
#include <QMouseEvent> #include <QMouseEvent>
#include <QProcess>
#include <QStringList> #include <QStringList>
#include <QTcpServer> #include <QTcpServer>
#include <QtDebug> #include <QtDebug>
@ -59,6 +58,7 @@
#include <sys/statvfs.h> #include <sys/statvfs.h>
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
#include <windows.h> #include <windows.h>
#include <QProcess>
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
@ -76,6 +76,7 @@
#include "CoreServices/CoreServices.h" #include "CoreServices/CoreServices.h"
#include "IOKit/ps/IOPowerSources.h" #include "IOKit/ps/IOPowerSources.h"
#include "IOKit/ps/IOPSKeys.h" #include "IOKit/ps/IOPSKeys.h"
#include <QProcess>
#endif #endif
namespace Utilities { namespace Utilities {
@ -410,9 +411,7 @@ void OpenInFileBrowser(const QList<QUrl>& urls) {
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
ShowFileInExplorer(path); ShowFileInExplorer(path);
#else #else
QStringList args; QDesktopServices::openUrl(QUrl::fromLocalFile(directory));
args << directory;
QProcess::startDetached("xdg-open", args);
#endif #endif
} }
} }