diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 281bfdb..3a31a8f 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.cc,v 1.56 2002/07/20 09:32:34 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.57 2002/07/23 13:47:05 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -823,16 +823,16 @@ void BScreen::changeWorkspaceID(unsigned int id) { | |||
823 | } | 823 | } |
824 | 824 | ||
825 | 825 | ||
826 | void BScreen::sendToWorkspace(unsigned int id, bool changeWS) { | 826 | void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS) { |
827 | FluxboxWindow *win; | ||
828 | if (! current_workspace || id >= workspacesList.size()) | 827 | if (! current_workspace || id >= workspacesList.size()) |
829 | return; | 828 | return; |
830 | 829 | ||
830 | if (!win) | ||
831 | win = fluxbox->getFocusedWindow(); | ||
832 | |||
831 | if (id != current_workspace->workspaceID()) { | 833 | if (id != current_workspace->workspaceID()) { |
832 | XSync(fluxbox->getXDisplay(), True); | 834 | XSync(fluxbox->getXDisplay(), True); |
833 | 835 | ||
834 | win = fluxbox->getFocusedWindow(); | ||
835 | |||
836 | if (win && win->getScreen() == this && | 836 | if (win && win->getScreen() == this && |
837 | (! win->isStuck())) { | 837 | (! win->isStuck())) { |
838 | 838 | ||