Merge pull request #40 from NiceandGently/master

screenshot: do not segfault when taking a window picture with no delay

1 files changed, 11 insertions, 2 deletions

diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c
index cd0ed540..63ec5d9b 100644
--- a/mate-screenshot/mate-screenshot.c
+++ b/mate-screenshot/mate-screenshot.c
@@ -1368,8 +1368,17 @@ main (int argc, char *argv[])
     }
   else
     {
-      /* start this in an idle anyway and fire up the mainloop */
-      g_idle_add (prepare_screenshot_timeout, NULL);
+      if (interactive_arg)
+        {
+          /* HACK: give time to the dialog to actually disappear.
+           * We don't have any way to tell when the compositor has finished 
+           * re-drawing.
+           */
+          g_timeout_add (200,
+                         prepare_screenshot_timeout, NULL);
+        }
+      else
+        g_idle_add (prepare_screenshot_timeout, NULL);
     }
 
   gtk_main ();