2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ec4ed05..a6acc44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *06/08/05:
+   * Don't call placement strategy on maximized or fullscreen windows (Mark)
+     Window.cc
    * Updated man fluxstyle (thanks Guillermo Patterer)
      doc/asciidoc/fluxstyle.txt
 *06/08/04:
diff --git a/src/Window.cc b/src/Window.cc
index 1895b13..5aebad4 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -382,7 +382,9 @@ FluxboxWindow::~FluxboxWindow() {
 void FluxboxWindow::init() {
     m_attaching_tab = 0;
     // magic to detect if moved by hints
-    m_old_pos_x = 0;
+    // don't use 0, since setting maximized or fullscreen on the window will set
+    // this to 0
+    m_old_pos_x = m_screen.width();
 
     assert(m_client);
     m_client->setFluxboxWindow(this);
@@ -512,7 +514,7 @@ void FluxboxWindow::init() {
     if (m_workspace_number < 0 || m_workspace_number >= screen().numberOfWorkspaces())
         m_workspace_number = screen().currentWorkspaceID();
 
-    bool place_window = (m_old_pos_x == 0);
+    bool place_window = (m_old_pos_x == static_cast<signed>(m_screen.width()));
 
     if (fluxbox.isStartup())
         place_window = false;