3 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e7b2553..2e44efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
+*06/05/16:
+   * Fix bug with horizontal maximisation when quadrant resizing (Mathias)
+     Window.hh/cc
 *06/05/13:
    * Fixed some title redraw issues (Thanks _markt)
      WinClient.cc, Window.cc
diff --git a/src/Window.cc b/src/Window.cc
index cbcb1f7..b87a9a5 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1655,6 +1655,9 @@ void FluxboxWindow::maximize(int type) {
     if (isShaded())
         shade();
 
+    if (isResizing())
+        stopResizing();
+
     int head = screen().getHead(frame().window());
     int new_x = frame().x(),
         new_y = frame().y(),
@@ -1730,7 +1733,12 @@ void FluxboxWindow::maximize(int type) {
     m_last_resize_y = new_y;
     m_last_resize_w = new_w;
     m_last_resize_h = new_h;
+    
+    ResizeCorner old_resize_corner = m_resize_corner;
+    m_resize_corner = NOCORNER;
     fixsize();
+    m_resize_corner = old_resize_corner;
+
     moveResize(m_last_resize_x, m_last_resize_y, m_last_resize_w, m_last_resize_h);
 }
 /**
diff --git a/src/Window.hh b/src/Window.hh
index 9c72ba3..db3e285 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -135,6 +135,7 @@ public:
     };
 
     enum ResizeCorner {
+        NOCORNER,
         LEFTTOP,
         LEFTBOTTOM,
         RIGHTBOTTOM,