Mercurial Repositories > eric / file diff

diff -r 25c93adb5de9 -r adecbc6335c5 eric6/ViewManager/ViewManager.py
--- a/eric6/ViewManager/ViewManager.py	Fri Sep 27 11:33:22 2019 +0200
+++ b/eric6/ViewManager/ViewManager.py	Fri Sep 27 14:49:42 2019 +0200
@@ -1072,7 +1072,7 @@
             QKeySequence(QCoreApplication.translate(
                 'ViewManager', "Ctrl+J", "Edit|Join Lines")),
             0,
-            self.copyActGrp, 'vm_edit_join_lines')
+            self.editActGrp, 'vm_edit_join_lines')
         self.joinAct.setStatusTip(QCoreApplication.translate(
             'ViewManager', 'Join Lines'))
         self.joinAct.setWhatsThis(QCoreApplication.translate(
@@ -5441,6 +5441,9 @@
         """
         from QScintilla.Shell import Shell
         
+        if now is None:
+            return
+        
         if not isinstance(now, (Editor, Shell)):
             self.editActGrp.setEnabled(False)
             self.copyActGrp.setEnabled(False)