Skip to content

Commit

Permalink
more!
Browse files Browse the repository at this point in the history
  • Loading branch information
mattkae committed Aug 26, 2024
1 parent 7ca2382 commit b7b2f85
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/auto_restarting_launcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void AutoRestartingLauncher::launch(miracle::StartupApp const& cmd)
}
mir::log_info("Started external client %s with pid=%d", cmd.command.c_str(), pid);

if (cmd.restart_on_death)
if (cmd.restart_on_death || cmd.should_halt_compositor_on_death)
pid_to_command_map[pid] = cmd;
}

Expand Down
12 changes: 8 additions & 4 deletions src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,14 @@ void FilesystemConfiguration::load(mir::Server& server)
std::optional<StartupApp> exec_app = std::nullopt;
if (server_opts->is_set(exec_option))
{
exec_app = StartupApp {
.command=server_opts->get<std::string>(exec_option),
.should_halt_compositor_on_death=true
};
auto command = server_opts->get<std::string>(exec_option);
if (!command.empty())
{
exec_app = StartupApp {
.command=command,
.should_halt_compositor_on_death=true
};
}
}
_init(exec_app);
});
Expand Down

0 comments on commit b7b2f85

Please sign in to comment.