commands/globals: invert a condition to reduce indent level

1 files changed, 24 insertions, 22 deletions

diff --git a/alot/commands/globals.py b/alot/commands/globals.py
index 76ecc1f4..885e3575 100644
--- a/alot/commands/globals.py
+++ b/alot/commands/globals.py
@@ -795,29 +795,31 @@ class ComposeCommand(Command):
 
     async def _set_signature(self, ui):
         account = self.envelope.account
-        if not self.omit_signature and account.signature:
-            logging.debug('has signature')
-            sig = os.path.expanduser(account.signature)
-            if os.path.isfile(sig):
-                logging.debug('is file')
-                if account.signature_as_attachment:
-                    name = account.signature_filename or None
-                    self.envelope.attach_file(sig, filename = name)
-                    logging.debug('attached')
-                else:
-                    try:
-                        with open(sig, 'r') as f:
-                            sigcontent = f.read()
-                    except UnicodeDecodeError:
-                        ui.notify('Could not read signature', priority = 'error')
-                    else:
-                        self.envelope.body += '\n' + sigcontent
+        if self.omit_signature or not account.signature:
+            return
+
+        logging.debug('has signature')
+        sig = os.path.expanduser(account.signature)
+        if os.path.isfile(sig):
+            logging.debug('is file')
+            if account.signature_as_attachment:
+                name = account.signature_filename or None
+                self.envelope.attach_file(sig, filename = name)
+                logging.debug('attached')
             else:
-                ui.notify('could not locate signature: %s' % sig,
-                          priority='error')
-                if (await ui.choice('send without signature?', 'yes',
-                                    'no')) == 'no':
-                    raise self.ApplyError
+                try:
+                    with open(sig, 'r') as f:
+                        sigcontent = f.read()
+                except UnicodeDecodeError:
+                    ui.notify('Could not read signature', priority = 'error')
+                else:
+                    self.envelope.body += '\n' + sigcontent
+        else:
+            ui.notify('could not locate signature: %s' % sig,
+                      priority='error')
+            if (await ui.choice('send without signature?', 'yes',
+                                'no')) == 'no':
+                raise self.ApplyError
 
     async def apply(self, ui):
         try: