Resolved logical merge conflicts

Azarattum · Aug 8, 2021 · 95fcc48 · 95fcc48
1 parent 890deb7
commit 95fcc48
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/src/config/ParseConfig.cpp b/src/config/ParseConfig.cpp
@@ -391,15 +391,12 @@ void ParseConfig::add_mapping(std::string name, Action output) {
   }
   else {
     // set context default mapping
-    if (!it->default_mapping.empty())
+    if (!it->default_mapping.sequence.empty())
       error("Duplicate mapping of '" + name + "'");
     it->default_mapping = std::move(output);
   }
 
   // set context default mapping
-  if (!it->default_mapping.sequence.empty() || !it->default_mapping.command.empty())
-    error("duplicate mapping of '" + name + "'");
-  it->default_mapping = std::move(output);
   m_commands_mapped[name] = true;
 }
 

diff --git a/src/config/ParseKeySequence.cpp b/src/config/ParseKeySequence.cpp
@@ -110,7 +110,7 @@ void ParseKeySequence::parse(It it, const It end) {
       output_on_release = true;
     }
     else if (skip(&it, end, "~")) {
-      add_key_to_sequence(read_ident(&it, end), KeyState::Exclusive);
+      add_key_to_sequence(read_key(&it, end), KeyState::Exclusive);
     }
     else if (skip(&it, end, "(")) {
       // begin together-group

diff --git a/src/linux/client/FocusedWindow.cpp b/src/linux/client/FocusedWindow.cpp
@@ -33,9 +33,6 @@ class FocusedWindow {
   }
 
   bool update() {
-    // TODO: is there a better way to prevent races?
-    const auto handler = XSetErrorHandler(&ignore_errors);
-
     const auto window = get_focused_window();
     auto window_title = get_window_title(window);
     if (window == m_focused_window &&