The mvwm repository's master branch has been updated.

The following shows the diffstat and patchsets between the merged result
and HEAD.

commit 8c03e344b121be191495b6f64b45671869c03b30
Author: Thomas Adam <[email protected]>
Date:   Thu Sep 11 14:30:07 2014 +0100

    StartsOnPage:  Fix monitor segfault
    
    When using StartsOnPage with SkippMapping, add extra checks to acquire the
    monitor correctly.
---
 mvwm/placement.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mvwm/placement.c b/mvwm/placement.c
index f81ff5a..b9f6e34 100644
--- a/mvwm/placement.c
+++ b/mvwm/placement.c
@@ -610,8 +610,10 @@ static int __pl_minoverlap_get_next_x(const pl_arg_t *arg)
 
        x = arg->place_g.x;
        y = arg->place_g.y;
+       m = monitor_by_xy(x, y);
 
-       m = monitor_by_xy(x, y); 
+       if (m == NULL)
+               m = monitor_get_current();
 
        if (arg->flags.use_percent == 1)
        {
@@ -754,6 +756,9 @@ static int __pl_minoverlap_get_next_y(const pl_arg_t *arg)
        y = arg->place_g.y;
        m = monitor_by_xy(x, y); 
 
+       if (m == NULL)
+               m = monitor_get_current();
+
        if (arg->flags.use_percent == 1)
        {
                start = 0;


Reply via email to