From fb552b2dbb970af7ee8da5f9739ac570bd3a903d Mon Sep 17 00:00:00 2001
From: muxator <a.mux@inwind.it>
Date: Wed, 31 Oct 2018 23:15:01 +0100
Subject: [PATCH] ImportHandler: early return via DeMorgan's law

Inverted a boolean condition, no functional changes.
---
 src/node/handler/ImportHandler.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 1526c778b..f347e7036 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -169,20 +169,22 @@ exports.doImport = function(req, res, padId)
       var fileIsTXT = (fileEnding === ".txt");
       if (fileIsTXT) useConvertor = false; // Don't use convertor for text files
       // See https://github.com/ether/etherpad-lite/issues/2572
-      if (useConvertor && !fileIsHTML) {
-        convertor.convertFile(srcFile, destFile, exportExtension, function(err) {
-          //catch convert errors
-          if(err) {
-            console.warn("Converting Error:", err);
-            return callback("convertFailed");
-          } else {
-            callback();
-          }
-        });
-      } else {
+      if (fileIsHTML || (useConvertor === false)) {
         // if no convertor only rename
         fs.rename(srcFile, destFile, callback);
+        
+        return;
       }
+
+      convertor.convertFile(srcFile, destFile, exportExtension, function(err) {
+        //catch convert errors
+        if(err) {
+          console.warn("Converting Error:", err);
+          return callback("convertFailed");
+        } else {
+          callback();
+        }
+      });
     },
     
     function(callback) {