diff --git a/src/frame_main.cpp b/src/frame_main.cpp index 66c9e97..2d99c72 100644 --- a/src/frame_main.cpp +++ b/src/frame_main.cpp @@ -59,7 +59,6 @@ int main(int argc, char const* argv[]) ConfigurationOption{[&](auto& option) { background_client.set_crash_background_colour(option);}, "diagnostic-background", "Colour of diagnostic screen background RGB", "0x380c24"}, ConfigurationOption{[&](auto& option) { background_client.set_crash_text_colour(option);}, - "diagnostic-text", "Colour of diagnostic screen text RGB", "0xffffff"}, ConfigurationOption{[&] (auto& option) { background_client.set_diagnostic_path(option);}, "diagnostic-path", "Path (including filename) of diagnostic file", ""}, diff --git a/src/snap_name_of.cpp b/src/snap_name_of.cpp index 44b1f9c..13a24ee 100644 --- a/src/snap_name_of.cpp +++ b/src/snap_name_of.cpp @@ -43,7 +43,7 @@ auto snap_name_of(miral::Application const& app, bool fallback_without_apparmor, // EINVAL is what is returned when AppArmor isn't setup // ENOPROTOOPT is what is returned when AppArmor doesn't have some Ubuntu patches (yet) - if (((errno == EINVAL)|| errno == ENOPROTOOPT) && fallback_without_apparmor) + if (((errno == EINVAL) || errno == ENOPROTOOPT) && fallback_without_apparmor) { mir::log_info("Fall back (without AppArmor): Identify client via /proc/%%d/cmdline");