mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-27 16:02:00 +00:00
Merge tag 'v6.7.8' into dev
# Conflicts: # .github/workflows/mac_packaged.yml # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/api/api_chat_invite.h # Telegram/SourceFiles/boxes/language_box.cpp # Telegram/SourceFiles/boxes/send_files_box.h # Telegram/SourceFiles/boxes/sticker_set_box.cpp # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/data/data_types.h # Telegram/SourceFiles/history/history_item.cpp # Telegram/SourceFiles/history/history_widget.cpp # Telegram/SourceFiles/history/view/history_view_chat_section.cpp # Telegram/SourceFiles/history/view/history_view_message.cpp # Telegram/SourceFiles/history/view/history_view_translate_bar.cpp # Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp # Telegram/SourceFiles/platform/mac/main_window_mac.mm # Telegram/SourceFiles/settings/sections/settings_main.cpp # Telegram/lib_ui # snap/snapcraft.yaml
This commit is contained in:
@@ -807,9 +807,23 @@ bool OpenSystemSettings(SystemSettingsType type) {
|
||||
add("pavucontrol");
|
||||
add("alsamixergui");
|
||||
return ranges::any_of(options, [](const Command &command) {
|
||||
return QProcess::startDetached(
|
||||
command.command,
|
||||
command.arguments);
|
||||
QProcess process;
|
||||
if (KSandbox::isInside()) {
|
||||
process.setProgram("which");
|
||||
process.setArguments({command.command});
|
||||
KSandbox::startHostProcess(process);
|
||||
process.waitForFinished();
|
||||
if (process.exitStatus() != QProcess::NormalExit
|
||||
|| process.exitCode() != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
process.setProgram(command.command);
|
||||
process.setArguments(command.arguments);
|
||||
const auto hostContext = KSandbox::makeHostContext(process);
|
||||
process.setProgram(hostContext.program);
|
||||
process.setArguments(hostContext.arguments);
|
||||
return process.startDetached();
|
||||
});
|
||||
}
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user