2 files changed, 0 insertions, 4 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 2a4ea9b..b676a8b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1764,9 +1764,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
               "Workspace Warping",
               "Workspace Warping - dragging windows to the edge and onto the next workspace",
               *resource.workspace_warping, saverc_cmd);
-    _BOOLITEM(menu, Configmenu, DesktopWheeling,
-              "Desktop MouseWheel Switching", "Workspace switching using mouse wheel",
-              *resource.desktop_wheeling, saverc_cmd);
     _BOOLITEM(menu, Configmenu, DecorateTransient,
               "Decorate Transient Windows", "Decorate Transient Windows",
               *resource.decorate_transient, saverc_cmd);
diff --git a/src/Window.cc b/src/Window.cc
index 0deecd2..36bd271 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -596,7 +596,6 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
         // figure out which client to raise at the end
         if (FocusControl::focusedFbWindow() == old_win) {
             was_focused = true;
-            focused_win = FocusControl::focusedWindow();
         } else if (FocusControl::focusedFbWindow() != this) {
             FocusControl::FocusedWindows focus_list =
                     screen().focusControl().focusedOrderList();