Merge branch 'develop' of github.com:olivierkes/manuskript into develop

Author: TheJackiMonster

manuskript/functions/spellchecker.py

@@ -363,7 +363,7 @@ def isMisspelled(self, word):
 
     def getSuggestions(self, word):
         candidates = self._dict.candidates(word)
-        if word in candidates:
+        if candidates and word in candidates:
             candidates.remove(word)
         return candidates
 

manuskript/ui/views/textEditView.py

@@ -620,10 +620,11 @@ def createStandardContextMenu(self):
 
                         selectedWord = cursor.selectedText()
 
-                    for word in match.replacements:
-                        action = self.SpellAction(word, spell_menu)
-                        action.correct.connect(self.correctWord)
-                        spell_menu.addAction(action)
+                    if match.replacements:
+                        for word in match.replacements:
+                            action = self.SpellAction(word, spell_menu)
+                            action.correct.connect(self.correctWord)
+                            spell_menu.addAction(action)
 
                     # Adds: add to dictionary
                     addAction = QAction(self.tr("&Add to dictionary"), popup_menu)
@@ -635,7 +636,7 @@ def createStandardContextMenu(self):
 
                     # Only add the spelling suggests to the menu if there are
                     # suggestions.
-                    if len(match.replacements) > 0:
+                    if match.replacements and len(match.replacements) > 0:
                         # Adds: suggestions
                         popup_menu.insertMenu(popup_menu.actions()[0], spell_menu)
                 else: