- if (index == 0)
- screen->addWorkspace();
- else if (index == 1)
- screen->removeLastWorkspace();
- else if ((screen->getCurrentWorkspace()->getWorkspaceID() !=
- (index - 2)) && ((index - 2) < screen->getWorkspaceCount()))
- screen->changeWorkspaceID(index - 2);
-
- if (! (screen->getWorkspacemenu()->isTorn() || isTorn()))
+ if (index == 0) {
+ getScreen()->addWorkspace();
+ } else if (index == 1) {
+ getScreen()->removeLastWorkspace();
+ } else {
+ index -= 2;
+ const Workspace* const wkspc = getScreen()->getCurrentWorkspace();
+ if (wkspc->getID() != index && index < getScreen()->getWorkspaceCount())
+ getScreen()->changeWorkspaceID(index);
+ }
+ if (! (getScreen()->getWorkspacemenu()->isTorn() || isTorn()))