From 58a080fe6b7e2cb007f1009dadf0f23678cf665f Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Sat, 18 Feb 2017 17:20:49 -0500
Subject: [PATCH] 4.12, delete message fix

---
 src/gam.py | 4 ++--
 src/var.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gam.py b/src/gam.py
index 8eb7ab20..c3105e8a 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -4970,8 +4970,6 @@ def doProcessMessagesOrThreads(users, function, unit=u'messages'):
     kwargs = {u'body': {}}
     for my_key in body:
       kwargs[u'body'][my_key] = labelsToLabelIds(gmail, body[my_key])
-    if not kwargs[u'body']:
-      del kwargs[u'body']
     i = 0
     if unit == u'messages' and function in [u'delete', u'modify']:
       batchFunction = u'batch%s' % function.title()
@@ -4990,6 +4988,8 @@ def doProcessMessagesOrThreads(users, function, unit=u'messages'):
         processed_messages += len(id_batch)
         print u'%s %s of %s messages' % (function, processed_messages, result_count)
       continue
+    if not kwargs[u'body']:
+      del kwargs[u'body']
     for a_unit in listResult:
       i += 1
       print u' %s %s %s for user %s (%s/%s)' % (function, unit, a_unit[u'id'], user, i, result_count)
diff --git a/src/var.py b/src/var.py
index 49eefbb8..91711723 100644
--- a/src/var.py
+++ b/src/var.py
@@ -4,7 +4,7 @@ import platform
 import re
 
 gam_author = u'Jay Lee <jay0lee@gmail.com>'
-gam_version = u'4.11'
+gam_version = u'4.12'
 gam_license = u'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = u'http://git.io/gam'