xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src: Don't show startup information when opening a file

Browse Source 
Follow-up to #3317
This commit is contained in:
Frank LENORMAND 2020-02-07 12:27:54 +01:00
parent e9cf0f23f2
commit 7790e31eb8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.cc
View File

@ -1161,10 +1161,11 @@ int main(int argc, char* argv[])
try try
{ {
auto ignore_kakrc = (bool)parser.get_switch("n"); auto ignore_kakrc = (bool)parser.get_switch("n");
auto flags = (ignore_kakrc ? ServerFlags::IgnoreKakrc : ServerFlags::None) | auto flags = (ignore_kakrc ? ServerFlags::IgnoreKakrc : ServerFlags::None) |
(parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) | (parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) |
(parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) | (parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) |
((argc == 2 and ignore_kakrc) and isatty(0) ? ServerFlags::StartupInfo : ServerFlags::None); ((argc == 1 or (ignore_kakrc and argc == 2))
and isatty(0) ? ServerFlags::StartupInfo : ServerFlags::None);
auto debug_flags = option_from_string(Meta::Type<DebugFlags>{}, parser.get_switch("debug").value_or("")); auto debug_flags = option_from_string(Meta::Type<DebugFlags>{}, parser.get_switch("debug").value_or(""));
return run_server(session, server_init, client_init, init_coord, flags, ui_type, debug_flags, files); return run_server(session, server_init, client_init, init_coord, flags, ui_type, debug_flags, files);
} }