[vlc-commits] commit: luatelnet: remove the telnet commands from the command line. ( Rémi Duraffort )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Nov  8 18:33:23 2010 +0100| [4af27d516b88543e67837dfc8837686664786f35] | committer: Rémi Duraffort 

luatelnet: remove the telnet commands from the command line.
(cherry picked from commit 021552a218a6011bf994839e983598886466d65f)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4af27d516b88543e67837dfc8837686664786f35
---

 share/lua/intf/telnet.lua |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/lua/intf/telnet.lua b/share/lua/intf/telnet.lua
index 209ae90..b07e14a 100644
--- a/share/lua/intf/telnet.lua
+++ b/share/lua/intf/telnet.lua
@@ -193,9 +193,6 @@ while not vlc.misc.should_die() do
             -- Caught a ^D
             client.cmds = "quit"
         end
-        if client.type == host.client_type.net then
-            telnet_commands( client )
-        end
 
         client.buffer = ""
         -- split the command at the first '\n'
@@ -208,6 +205,12 @@ while not vlc.misc.should_die() do
             client.buffer = string.gsub(string.sub(client.cmds, 0, index - 1), "^%s*(.-)%s*$", "%1")
             client.cmds = string.sub(client.cmds, index + 1)
 
+            -- Remove telnet commands from the command line
+            if client.type == host.client_type.net then
+                telnet_commands( client )
+            end
+
+            -- Run the command
             if client.status == host.status.password then
                 if client.buffer == password then
                     client:send( IAC..WONT..ECHO.."\r\nWelcome, Master\r\n" )