Issue 1399: fix floating window bug

Author: RobertMueller2

src/modules/sway/window.cpp

@@ -231,13 +231,13 @@ std::tuple<std::size_t, int, int, std::string, std::string, std::string> gfnWith
 
     // iterate
     auto [nb, f, id, name, app_id, workspace_layout] = gfnWithWorkspace(node["nodes"], output, config_, bar_, parentWorkspace, filterWorkspace, node["type"].asString());
-    if (id > -1 && !name.empty()) {
+    auto [nb2, f2, id2, name2, app_id2, workspace_layout2] = gfnWithWorkspace(node["floating_nodes"], output, config_, bar_, parentWorkspace, filterWorkspace, node["type"].asString());
+
+    if ((id > 0 || ((id2 < 0 || name2.empty()) &&  id > -1)) && !name.empty()) {
       return {nb, f, id, name, app_id, workspace_layout};
     }
-    // Search for floating node
-    std::tie(nb, f, id, name, app_id, workspace_layout) = gfnWithWorkspace(node["floating_nodes"], output, config_, bar_, parentWorkspace, filterWorkspace, node["type"].asString());
-    if (id > -1 && !name.empty()) {
-      return {nb, f, id, name, app_id,workspace_layout};
+    else if (id2 > 0 && !name2.empty()) {
+      return {nb2, f2, id2, name2, app_id2,workspace_layout2};
     }
   }
   /* "parentType" might be a bit misleading, it's the parent of the nodes being iterated in the loop above.