diff options
author | bunnei <bunneidev@gmail.com> | 2021-03-12 12:10:28 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-12 12:10:28 -0800 |
commit | 5dae45b958908fedb4fb55def3d5ee5ad51f8266 (patch) | |
tree | da0aae3f9aa857a794797cc43b93ab4c31b159ee | |
parent | 827dcad26ea09fdf1926984cb6f8a0a4976996c6 (diff) | |
parent | cd7abba1a9e713e9557f6dfcae1b609eaa91995b (diff) |
Merge pull request #5327 from AniLeo/master
qt: Set DISPLAY env var when not present
-rw-r--r-- | src/yuzu/main.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 56d892a31..24bfa4d34 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -60,6 +60,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include <QPushButton> #include <QShortcut> #include <QStatusBar> +#include <QString> #include <QSysInfo> #include <QUrl> #include <QtConcurrent/QtConcurrent> @@ -3061,6 +3062,14 @@ int main(int argc, char* argv[]) { chdir(bin_path.c_str()); #endif +#ifdef __linux__ + // Set the DISPLAY variable in order to open web browsers + // TODO (lat9nq): Find a better solution for AppImages to start external applications + if (QString::fromLocal8Bit(qgetenv("DISPLAY")).isEmpty()) { + qputenv("DISPLAY", ":0"); + } +#endif + // Enables the core to make the qt created contexts current on std::threads QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); QApplication app(argc, argv); |