Help command: don't use EvMore if help text is shown in popup

evennia/commands/default/help.py

@@ -42,19 +42,33 @@ class CmdHelp(Command):
     # the current cmdset with the call to self.func().
     return_cmdset = True
 
-
+    # Help messages are wrapped in an EvMore call (unless using the webclient
-    # Help messages are wrapped in an EvMore call.  If you want to
+    # with separate help popups) If you want to avoid this, simply set the
-    # avoid this, simply set the 'help_more' flag to False.
+    # 'help_more' flag to False.
     help_more = True
 
-
     def msg_help(self, text):
         """
         messages text to the caller, adding an extra oob argument to indicate
         that this is a help command result and could be rendered in a separate
         help window
         """
-        self.msg((text, {"window": "help"}));
+        if type(self).help_more:
+            usemore = True
+
+            if self.session.protocol_key in ("websocket", "ajax/comet"):
+                try:
+                    options = self.caller.player.db._saved_webclient_options
+                    if options["helppopup"]:
+                        usemore = False
+                except KeyError:
+                    pass
+
+            if usemore:
+                evmore.msg(self.caller, text)
+                return
+
+        self.msg((text, {"window": "help"}))
 
     @staticmethod
     def format_help_entry(title, help_text, aliases=None, suggested=None):
@@ -209,9 +223,6 @@ class CmdHelp(Command):
                      match[0].__doc__,
                      aliases=match[0].aliases,
                      suggested=suggestions)
-            if type(self).help_more:
-                evmore.msg(caller, formatted)
-            else:
             self.msg_help(formatted)
             return
 
@@ -222,9 +233,6 @@ class CmdHelp(Command):
                      match[0].entrytext,
                      aliases=match[0].aliases.all(),
                      suggested=suggestions)
-            if type(self).help_more:
-                evmore.msg(caller, formatted)
-            else:
             self.msg_help(formatted)
             return