MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to remove Wayland blacklist again

This commit is contained in:
Ilya Fedin 2023-03-20 14:14:56 +04:00 committed by John Preston
parent dc459d454f
commit c78a15410d
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/core/launcher.cpp
View File

@ -69,14 +69,7 @@ FilteredCommandLineArguments::FilteredCommandLineArguments(
pushArgument("cocoa:fontengine=freetype");
#endif // !Q_OS_WIN
}
#elif defined Q_OS_UNIX
if (QFile::exists(cWorkingDir() + u"tdata/nowayland"_q)
&& qEnvironmentVariableIsEmpty("QT_QPA_PLATFORM")) {
LOG(("Wayland: Disable on old installations"));
pushArgument("-platform");
pushArgument("xcb;wayland");
}
#endif // Q_OS_WIN || Q_OS_MAC || Q_OS_UNIX
#endif // Q_OS_WIN || Q_OS_MAC
pushArgument(nullptr);
}

12
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -858,18 +858,6 @@ bool OpenSystemSettings(SystemSettingsType type) {
}
void NewVersionLaunched(int oldVersion) {
if (oldVersion > 0
&& oldVersion <= 4000002
&& qEnvironmentVariableIsSet("WAYLAND_DISPLAY")
&& DesktopEnvironment::IsGnome()
&& !QFile::exists(cWorkingDir() + u"tdata/nowayland"_q)) {
QFile f(cWorkingDir() + u"tdata/nowayland"_q);
if (f.open(QIODevice::WriteOnly)) {
f.write("1");
f.close();
Core::Restart(); // restart with X backend
}
}
if (oldVersion <= 4001001 && cAutoStart()) {
AutostartToggle(true);
}