Skip to content
Browse files

Merge branch 'master' into multihead

  • Loading branch information...
2 parents 2bf6639 + 76a5fca commit 4e7c884b433023610ae7864ab68f0f8c4aab42b4 @BurntSushi committed Jun 25, 2012
Showing with 12 additions and 2 deletions.
  1. +1 −1 data/autostart/autostart.in
  2. +1 −1 openbox/client.c
  3. +10 −0 openbox/moveresize.c
View
2 data/autostart/autostart.in
@@ -8,7 +8,7 @@
#
#if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
# @libexecdir@/gnome-settings-daemon &
-#elif which gnome-settings-daemon >/dev/null; then
+#elif which gnome-settings-daemon >/dev/null 2>&1; then
# gnome-settings-daemon &
#fi
View
2 openbox/client.c
@@ -944,7 +944,7 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
!g_pattern_match(app->role,
strlen(self->role), self->role, NULL))
match = FALSE;
- else if (app->title &&
+ else if (app->title && self->title &&
!g_pattern_match(app->title,
strlen(self->title), self->title, NULL))
match = FALSE;
View
10 openbox/moveresize.c
@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel)
#endif
}
+ if (!moveresize_client) {
+ ob_debug("moveresize_end: moveresize_client is NULL!");
+ return;
+ }
+
+ if (!moveresize_in_progress) {
+ ob_debug("moveresize_end: moveresize_in_progress is FALSE!");
+ return;
+ }
+
/* don't use client_move() here, use the same width/height as
we've been using during the move, otherwise we get different results
when moving maximized windows between monitors of different sizes !

0 comments on commit 4e7c884

Please sign in to comment.
Something went wrong with that request. Please try again.