d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1731 from q234rty/master

Browse source 
Use `XDG_ACTIVATION_TOKEN` from environment variables by default
This commit is contained in:
DeepBlueV7.X 2024-05-16 11:32:02 +00:00 committed by GitHub
commit f1f7f8e730
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main.cpp
View file

@ -259,7 +259,10 @@ main(int argc, char *argv[])
// getting a valid activation token on wayland is a bit of a pain, it works most reliably // getting a valid activation token on wayland is a bit of a pain, it works most reliably
// when you have an actual window, that has the focus... // when you have an actual window, that has the focus...
auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>(); auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>();
if (waylandApp) { // When the token is set in the env, use it by default as that's what we're supposed to do
// But leave a env knob so users can workaround terminal emulators that leak tokens
if (waylandApp &&
(!qEnvironmentVariableIsEmpty("NHEKO_FORCE_ACTIVATION_SPLASH") || token.isEmpty())) {
QQuickView window; QQuickView window;
window.setTitle("Activate main instance"); window.setTitle("Activate main instance");
window.setMaximumSize(QSize(100, 50)); window.setMaximumSize(QSize(100, 50));