mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 17:47:43 +00:00
WindowServer: Don't launch a terminal when clicking system menu separators.
The menu item for launching a terminal was sharing ID's with the separators.
This commit is contained in:
parent
e8d395b14d
commit
5b2e122624
1 changed files with 4 additions and 4 deletions
|
@ -95,8 +95,8 @@ WSWindowManager::WSWindowManager()
|
||||||
{
|
{
|
||||||
byte system_menu_name[] = { 0xf8, 0 };
|
byte system_menu_name[] = { 0xf8, 0 };
|
||||||
m_system_menu = make<WSMenu>(nullptr, -1, String((const char*)system_menu_name));
|
m_system_menu = make<WSMenu>(nullptr, -1, String((const char*)system_menu_name));
|
||||||
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 0, "Open Terminal..."));
|
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 1, "Open Terminal..."));
|
||||||
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 1, "Open ProcessManager..."));
|
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 2, "Open ProcessManager..."));
|
||||||
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, WSMenuItem::Separator));
|
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, WSMenuItem::Separator));
|
||||||
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 100, "640x480"));
|
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 100, "640x480"));
|
||||||
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 101, "800x600"));
|
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 101, "800x600"));
|
||||||
|
@ -107,14 +107,14 @@ WSWindowManager::WSWindowManager()
|
||||||
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, WSMenuItem::Separator));
|
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, WSMenuItem::Separator));
|
||||||
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 200, "About..."));
|
m_system_menu->add_item(make<WSMenuItem>(*m_system_menu, 200, "About..."));
|
||||||
m_system_menu->on_item_activation = [this] (WSMenuItem& item) {
|
m_system_menu->on_item_activation = [this] (WSMenuItem& item) {
|
||||||
if (item.identifier() == 0) {
|
if (item.identifier() == 1) {
|
||||||
if (fork() == 0) {
|
if (fork() == 0) {
|
||||||
execl("/bin/Terminal", "/bin/Terminal", nullptr);
|
execl("/bin/Terminal", "/bin/Terminal", nullptr);
|
||||||
ASSERT_NOT_REACHED();
|
ASSERT_NOT_REACHED();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (item.identifier() == 1) {
|
if (item.identifier() == 2) {
|
||||||
if (fork() == 0) {
|
if (fork() == 0) {
|
||||||
execl("/bin/ProcessManager", "/bin/ProcessManager", nullptr);
|
execl("/bin/ProcessManager", "/bin/ProcessManager", nullptr);
|
||||||
ASSERT_NOT_REACHED();
|
ASSERT_NOT_REACHED();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue