From 5a82a6db618808ccf09b34c9a5354861c4bc1c90 Mon Sep 17 00:00:00 2001
From: alby128 <alby128@gmail.com>
Date: Tue, 31 Oct 2017 15:22:58 +0100
Subject: [PATCH] Fixed defects found by Coverity

---
 syncplay/protocols.py | 14 ++++++++++----
 syncplay/ui/gui.py    |  2 +-
 syncplay/utils.py     |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/syncplay/protocols.py b/syncplay/protocols.py
index c0055be..59948b9 100644
--- a/syncplay/protocols.py
+++ b/syncplay/protocols.py
@@ -330,13 +330,19 @@ class SyncServerProtocol(JSONCommandProtocol):
 
     def _extractHelloArguments(self, hello):
         roomName = None
-        username = hello["username"] if hello.has_key("username") else None
-        username = username.strip()
+        if hello.has_key("username"):
+            username = hello["username"]
+            username = username.strip()
+        else:
+            username = None
         serverPassword = hello["password"] if hello.has_key("password") else None
         room = hello["room"] if hello.has_key("room") else None
         if room:
-            roomName = room["name"] if room.has_key("name") else None
-            roomName = roomName.strip()
+            if room.has_key("name"):
+                roomName = room["name"]
+                roomName = roomName.strip()
+            else:
+                roomName = None
         version = hello["version"] if hello.has_key("version") else None
         version = hello["realversion"] if hello.has_key("realversion") else version
         return username, serverPassword, roomName, version
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index a0ac7c9..de9c823 100755
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -518,7 +518,7 @@ class MainWindow(QtWidgets.QMainWindow):
                                 filenameitem.setForeground(QtGui.QBrush(QtGui.QColor(constants.STYLE_DIFFERENTITEM_COLOR)))
                                 filenameitem.setFont(underlinefont)
                             if not sameSize:
-                                if currentUser.file is not None and formatSize(user.file['size']) == formatSize(currentUser.file['size']):
+                                if formatSize(user.file['size']) == formatSize(currentUser.file['size']):
                                     filesizeitem = QtGui.QStandardItem(formatSize(user.file['size'],precise=True))
                                 filesizeitem.setFont(underlinefont)
                                 filesizeitem.setForeground(QtGui.QBrush(QtGui.QColor(constants.STYLE_DIFFERENTITEM_COLOR)))
diff --git a/syncplay/utils.py b/syncplay/utils.py
index 5b8cbb4..1a7a8ff 100644
--- a/syncplay/utils.py
+++ b/syncplay/utils.py
@@ -42,8 +42,8 @@ def retry(ExceptionToCheck, tries=4, delay=3, backoff=2, logger=None):
             try_one_last_time = True
             while mtries > 1:
                 try:
+                    #try_one_last_time = False
                     return f(*args, **kwargs)
-                    try_one_last_time = False
                     break
                 except ExceptionToCheck, e:
                     if logger: